This commit was manufactured by cvs2svn to create tagpre_non_tss_orb_core

'pre_non_tss_orb_core'.

1594 files changed, 161478 insertions, 183298 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 2f0caa9de23..376c381e17b 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,8 +249,8 @@ 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>
+      RedHat 5.1, 5.2 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
       files.<p>
 
@@ -525,8 +523,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>.
@@ -674,16 +672,9 @@ If you use the GNU GCC g++ compiler please note the following:
       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>
+      with the <code>--enable-shared</code> egcs config option.  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
@@ -792,10 +783,6 @@ need to do:<P>
 
 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
@@ -904,20 +891,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>
@@ -1139,30 +1119,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 +1127,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/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/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/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-99b b/ChangeLog-99b
index ef758e7cd65..988a5d01c46 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,2138 +1,9 @@
-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.
+          <Thomas_Mehrkam@i-o.com> for reporting that it's necessary on
+          his NT host.
 
 Wed Apr 14 18:56:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -2140,8 +11,7 @@ Wed Apr 14 18:56:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
           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.
+          Reddy <sreddy@tr.comm.mot.com> for contributing these changes.
 
 Wed Apr 14 17:06:22 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -2213,6 +83,7 @@ Wed Apr 14 02:34:13 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
         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
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 1e30846a964..13b847a5c49 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -21,7 +21,7 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 4.6.40
+    ACE VERSION: 4.6.36
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/README b/README
index 5ff97a09c55..aa2dc774811 100644
--- a/README
+++ b/README
@@ -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>
@@ -801,51 +801,12 @@ 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>
+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/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..9828b18eba7 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,4761 +1,45 @@
-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.
+	* 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>.
+	* 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.
+	* 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.
+	* 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.
+	* 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_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.
+	* 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>
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index e0e04394847..4a971902731 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-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.19
+    ACE VERSION: 4.6.36
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 8bdf749c4c2..71f3228260f 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -151,12 +151,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.
 
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..e76b98f03a3 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 \
@@ -175,6 +171,22 @@ else  # ! CROSS-COMPILE
 
   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 \
@@ -213,7 +225,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"
@@ -266,60 +277,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 \
@@ -349,60 +315,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 \
@@ -432,60 +353,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 \
@@ -515,17 +391,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 +431,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 +453,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 \
@@ -619,60 +487,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 +513,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
@@ -706,60 +543,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 \
@@ -789,60 +581,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 +607,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 \
@@ -879,60 +640,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 \
@@ -963,60 +679,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 \
@@ -1047,60 +718,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 \
@@ -1131,60 +757,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 \
@@ -1215,60 +796,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 \
@@ -1299,60 +835,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 \
@@ -1383,60 +874,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 \
@@ -1467,59 +913,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 \
@@ -1551,60 +952,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 \
@@ -1633,60 +989,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 \
@@ -1715,60 +1026,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 \
@@ -1797,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 \
@@ -1879,60 +1100,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 \
@@ -1961,60 +1137,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 \
@@ -2043,60 +1174,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 \
@@ -2125,60 +1211,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 \
@@ -2207,60 +1248,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 \
@@ -2289,60 +1285,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 \
@@ -2371,60 +1322,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 \
@@ -2453,60 +1359,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 \
@@ -2535,60 +1396,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 \
@@ -2617,60 +1433,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 \
@@ -2699,60 +1470,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 \
@@ -2781,60 +1507,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 \
@@ -2863,60 +1544,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 \
@@ -2945,60 +1581,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 \
@@ -3027,60 +1618,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 \
@@ -3109,60 +1655,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 \
@@ -3191,60 +1692,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 \
@@ -3273,60 +1729,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 \
@@ -3355,60 +1766,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 \
@@ -3437,60 +1803,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 \
@@ -3519,60 +1840,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 \
@@ -3601,60 +1877,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 \
@@ -3683,60 +1914,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 \
@@ -3765,60 +1951,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 \
@@ -3847,60 +1988,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 \
@@ -3929,60 +2025,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 \
@@ -4011,60 +2062,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 \
@@ -4093,60 +2099,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 \
@@ -4175,60 +2136,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 \
@@ -4257,60 +2173,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 \
@@ -4339,60 +2210,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 \
@@ -4421,60 +2247,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 \
@@ -4503,60 +2284,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 \
@@ -4585,60 +2321,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 \
@@ -4667,60 +2358,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 \
@@ -4749,60 +2395,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 \
@@ -4831,60 +2432,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 \
@@ -4913,60 +2469,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 \
@@ -4995,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 \
@@ -5077,60 +2543,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 \
@@ -5159,60 +2580,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 \
@@ -5241,60 +2617,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 \
@@ -5323,17 +2654,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 +2694,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 +2716,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 \
@@ -5427,17 +2750,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 +2790,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 +2812,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 \
@@ -5531,17 +2846,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 +2886,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 +2908,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 \
@@ -5635,17 +2942,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 +2982,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 +3004,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 \
@@ -5739,17 +3038,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 +3078,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 +3100,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 \
@@ -5843,17 +3134,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 +3174,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 +3196,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 \
@@ -5947,17 +3230,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 +3270,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 +3292,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 \
@@ -6051,17 +3326,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 +3366,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 +3388,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 \
@@ -6155,17 +3422,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 +3462,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 +3484,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 \
@@ -6259,60 +3518,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 +3562,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 +3576,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 +3598,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,9 +3617,9 @@ 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 \
@@ -6485,60 +3632,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 +3658,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 +3672,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 +3694,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 \
@@ -6693,17 +3728,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 +3768,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 +3790,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 \
@@ -6797,17 +3824,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 +3864,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 +3886,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 \
@@ -6901,17 +3920,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 +3960,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 +3982,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 \
@@ -7005,17 +4016,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 +4056,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 +4078,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 \
@@ -7109,17 +4112,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 +4152,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 +4174,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 \
@@ -7213,17 +4208,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 +4248,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 +4270,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 \
@@ -7328,17 +4315,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 +4355,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 +4377,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 \
@@ -7432,17 +4411,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 +4451,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 +4473,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 \
@@ -7536,17 +4507,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 +4547,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 +4569,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 \
@@ -7640,17 +4603,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 +4643,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 +4665,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 \
@@ -7744,17 +4699,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 +4739,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 +4761,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 \
@@ -7848,17 +4795,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 +4835,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 +4857,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 \
@@ -7952,17 +4891,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 +4931,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 +4953,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 \
@@ -8056,17 +4987,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 +5027,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 +5049,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 \
@@ -8160,17 +5083,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 +5123,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 +5145,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,8 +5165,7 @@ 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 \
@@ -8265,17 +5179,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 +5219,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 +5241,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 \
@@ -8369,17 +5275,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 +5315,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 +5337,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 \
@@ -8473,17 +5371,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 +5411,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 +5433,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 \
@@ -8577,17 +5467,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 +5507,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 +5529,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 \
@@ -8681,17 +5563,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 +5603,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 +5625,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 \
@@ -8786,17 +5660,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 +5700,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 +5722,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 \
@@ -8890,17 +5756,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 +5796,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 +5818,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 \
@@ -8994,17 +5852,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 +5892,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 +5914,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 \
@@ -9099,17 +5949,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 +5989,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 +6011,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 +6033,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 +6056,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 +6105,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 \
@@ -9396,17 +6217,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 +6254,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 +6276,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 \
@@ -9497,17 +6310,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 +6347,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 +6369,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 +6391,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 \
@@ -9630,17 +6434,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 +6474,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 +6496,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 \
@@ -9747,17 +6543,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 +6583,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 +6605,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 \
@@ -9855,17 +6643,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 +6683,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 +6705,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 \
@@ -9965,17 +6745,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 +6785,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 +6807,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 \
@@ -10069,17 +6841,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 +6881,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 +6903,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 \
@@ -10174,17 +6938,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 +6978,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 +7000,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 \
@@ -10288,17 +7044,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 +7084,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 +7106,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 \
@@ -10419,17 +7167,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 +7207,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 +7229,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 \
@@ -10532,17 +7272,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 +7312,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 +7334,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 \
@@ -10672,60 +7404,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 +7430,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 +7444,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 +7466,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,74 +7487,15 @@ 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 \
@@ -10955,60 +7508,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 +7534,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 +7548,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 +7570,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 \
@@ -11178,17 +7614,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 +7654,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 +7676,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 +7741,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 \
@@ -11357,17 +7769,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 +7809,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 +7831,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 \
@@ -11478,17 +7882,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 +7922,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 +7944,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 \
@@ -11583,17 +7979,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 +8019,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 +8041,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 \
@@ -11725,17 +8113,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 +8153,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 +8175,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 \
@@ -11852,17 +8232,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 +8272,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 +8294,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 +8316,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 \
@@ -11962,17 +8333,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 +8373,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 +8395,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 \
@@ -12083,17 +8446,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 +8486,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 +8508,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 \
@@ -12207,17 +8562,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 +8602,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 +8624,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/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index a9e0239f8b1..3551f838fd1 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -363,25 +363,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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))
+      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;
@@ -443,25 +435,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -521,25 +505,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -599,25 +575,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     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;
@@ -657,7 +625,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -677,6 +644,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_longlong:
       return ev;
+      return ev;
     case AST_Expression::EV_ulonglong:
       if (ev->u.ullval > ACE_INT64_MAX)
 	      return NULL;
@@ -721,11 +689,7 @@ 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_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
     switch (ev->et) {
     case AST_Expression::EV_short:
       if (ev->u.sval < 0)
@@ -793,9 +757,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:
@@ -815,21 +776,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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)
+    case AST_Expression::EV_ulonglong:
       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:
@@ -879,17 +832,12 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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
@@ -898,9 +846,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -952,15 +897,10 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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)
@@ -968,9 +908,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -1028,25 +965,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -1108,25 +1037,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -1190,25 +1111,17 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       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;
@@ -1542,7 +1455,9 @@ AST_Expression::coerce(AST_Expression::ExprType t)
 
   copy->et = pd_ev->et;
   switch (pd_ev->et) {
+  case EV_longlong:
   case EV_longdouble:
+  case EV_wchar:
   case EV_wstring:
   case EV_void:
   case EV_none:
@@ -1560,20 +1475,9 @@ 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 +1490,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 +1606,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 +1659,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 +1674,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 +1743,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 +1753,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:
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/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_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..17aa96be6c7 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -166,7 +166,7 @@ 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_);
@@ -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..e5aad6fe490 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -66,9 +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	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 #include        "../../tao/Version.h"
 
 ACE_RCSID(be, be_init, "$Id$")
@@ -84,11 +84,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;
 }
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index b926dfc27d4..9e9526f9b78 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)
@@ -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)
@@ -1152,7 +1235,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);
     }
 
@@ -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..5bb468e15cc 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,10 @@ 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);
@@ -118,16 +114,10 @@ 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 
+ 	        else
 	          this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
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..3a74fe1a90e 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -41,6 +41,99 @@ 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 << be_nl;
+
+  // be_union* the_union =
+  // be_union::narrow_from_scope (this->defined_in ());
+
+  ACE_UINT32 buf[1];
+  ACE_OS::memset (buf, 0, sizeof (buf));
+
+  // emit the case label value
+  AST_Expression *expression = this->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:
+      cs->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)ev->u.cval);
+      break;
+
+    case AST_Expression::EV_wchar:
+    case AST_Expression::EV_short:
+    case AST_Expression::EV_ushort:
+      cs->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)ev->u.sval);
+      break;
+
+    case AST_Expression::EV_long:
+    case AST_Expression::EV_ulonglong:
+      *cs << expression;
+      break;
+
+    default:
+      if (expression->ec () == AST_Expression::EC_symbol)
+        {
+          *cs << expression;
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "be_union_branch: (%N:%l) Label value "
+                             "type (%d) is invalid\n", ev->et), -1);
+        }
+      break;
+    }
+
+  *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)
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..3b1ce2ebfc9 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,12 +524,12 @@ 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 << ")";
               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 << ")";
               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..f21b3d95dca 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
@@ -672,7 +570,7 @@ 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 << ")";
               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..0a1d2d4dbd1 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,7 +85,6 @@ 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
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/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/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/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/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_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index ad2de24a08e..81805cdd084 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:
@@ -576,9 +533,9 @@ 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:
+	case TAO_CodeGen::TAO_OPERATION_IS:
       return new be_visitor_operation_is (new_ctx);
-         case TAO_CodeGen::TAO_OPERATION_IH:
+	 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);
@@ -614,8 +571,8 @@ 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_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..3e2759ebded 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"
 
@@ -99,7 +99,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
       // 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
+      // the parents's name 
 
       if (node->is_nested ())
         {
@@ -367,19 +367,19 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
       // is a psuedo obj
       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;
@@ -389,16 +389,16 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         *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;
@@ -621,7 +621,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);
@@ -820,26 +820,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..0548da82f16 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)
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..fd597b382a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
@@ -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 &ACE_TRY_ENV = " << 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..585d36e168e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
@@ -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 &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return this->servant_->_is_a (" << be_idt << be_idt_nl
+      << "logical_type_id," << be_nl
+      << "ACE_TRY_ENV" << 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..ff03c2a6bab 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -161,14 +161,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 	        << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
 	        << "CORBA::Environment &env = " << be_idt_nl
-	        << "CORBA::default_environment ()"
+	        << "CORBA::Environment::default_environment ()"
 	        << be_uidt << be_uidt_nl
 	        << ");" << be_uidt_nl
           << "static " << node->local_name () << "_ptr "
 	        << "_unchecked_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
 	        << "CORBA::Environment &env = " << be_idt_nl
-	        << "CORBA::default_environment ()"
+	        << "CORBA::Environment::default_environment ()"
 	        << be_uidt << be_uidt_nl
 	        << ");" << be_uidt_nl
           << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n";
@@ -188,7 +188,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
           << "const CORBA::Char *type_id, " << be_nl
           << "CORBA::Environment &env = " << be_idt_nl
-          << "CORBA::default_environment ()"
+          << "CORBA::Environment::default_environment ()"
           << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl
           << "virtual const char* "
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..f795da20bfc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -145,7 +145,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 +163,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..12a3a50a992 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -111,7 +111,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "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::default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
@@ -125,7 +125,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "void *obj," << be_nl
       << "void *context," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
@@ -136,7 +136,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "void *obj," << be_nl
       << "void *context," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
@@ -145,14 +145,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "CORBA::ServerRequest &_tao_req," << be_nl
       << "void *_tao_context," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment::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::default_environment ()"
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
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..6c665b55f4d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -139,54 +139,86 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   // generate code for the _is_a skeleton
+  // @@ TODO Use compiled marshaling here!!!
   os->indent ();
   *os << "void " << node->full_skel_name ()
       << "::_is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
-      << "void * /* context */," << be_nl
+      << "void * /*context*/," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV" << 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 << "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 << "{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
+      << "ACE_TRY_ENV, " << 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 << "ACE_CHECK;" <<be_nl;
+  *os << "_tao_retval = _tao_impl->_is_a (_tao_value.in (), "
+      << "ACE_TRY_ENV);" << be_nl;
+  //*os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);" << be_nl;
+  *os << "ACE_CHECK;"<<be_nl;
+  *os << "_tao_server_request.marshal (" << be_idt_nl
+      << "ACE_TRY_ENV, " << 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";
 
 
   // generate code for the _non_existent skeleton
+  // @@ TODO Use compiled marshaling here!!! Or remove this method!
   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
+      << "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 << 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 << "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
+      << "ACE_TRY_ENV, " << 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 << "CORBA::Boolean " << node->full_skel_name ()
       << "::_is_a (" << be_idt << be_idt_nl
@@ -251,10 +283,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "if (this->_find (opname, skel, req.operation_length ()) == -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 ());"
+  *os << "ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));"
     //<< "ACE_TRY_ENV);" << be_uidt_nl;
       << be_uidt_nl;
-    //  *os << "env.exception (new CORBA_BAD_OPERATION ());" << be_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;
@@ -310,6 +342,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   delete visitor;
 
   *os << "\n\n";
-
+  
   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_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..50c08c5f05d 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 ())
     {
@@ -71,7 +71,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
       os->indent ();
       *os << "CORBA::Environment &ACE_TRY_ENV";
       *os << " = " << be_idt_nl
-	        << "CORBA::default_environment ()"
+	        << "CORBA::Environment::default_environment ()"
 	        << be_uidt;
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
@@ -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/compiled_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
index fec555db545..76fc1c10c7e 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
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..d3d8de1f0cf 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"
 
@@ -151,7 +151,7 @@ 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)
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_operation_cs::"
@@ -170,7 +170,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
       // if the stub object was bad, then we raise a system exception
       if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF",
-                                     "") == -1)
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_operation_cs::"
@@ -222,6 +222,20 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
         }
 
+      // 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);
+        }
+
       if (!this->void_return_type (bt))
         {
           // now generate the normal successful return statement
@@ -578,36 +592,8 @@ 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);
-    }
+                            -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);
     }
 
   return 0;
@@ -633,15 +619,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,
@@ -738,7 +726,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
 
       // if marshaling fails, raise exception
       if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "") == -1)
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_cs::"
@@ -792,7 +780,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
 
   if (this->gen_raise_exception (bt,
                                  "CORBA::UNKNOWN",
-                                 "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES") == -1)
+                                 "CORBA::COMPLETED_YES") == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_compiled_visitor_operation_cs::"
@@ -808,67 +796,34 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
 
   // 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))
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
     {
-      // Generate any temporary variables to demarshal the return value
+      // 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 << "TAO_InputCDR &_tao_in = _tao_call.inp_stream ();" << be_nl
-      << "if (!(\n" << be_idt << be_idt << 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,14 +837,17 @@ 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
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS);
@@ -915,7 +873,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
           << "))" << be_nl;
       // if marshaling fails, raise exception
       if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES") == -1)
+                                     "CORBA::COMPLETED_YES") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_cs::"
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..7fa55be8778 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$")
 
@@ -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_;
@@ -355,12 +354,12 @@ int
 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";
-
+  
   return 0;
 }
 
@@ -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,8 +679,8 @@ 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",
-                                     "",
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO",
                                      "ACE_TRY_ENV") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -691,9 +690,9 @@ be_compiled_visitor_operation_ss::gen_demarshal_params (be_operation *node,
                             -1);
         }
       *os << be_uidt << "\n";
-
+      
     };
-
+  
   return 0;
 }
 
@@ -716,49 +715,17 @@ be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node,
 
   // 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 << "ACE_CHECK;" << 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",
+                                     "ACE_TRY_ENV") == -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..5aca2e91e9a 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"
 
@@ -82,43 +82,3 @@ visit_interface_fwd (be_interface_fwd *node)
   *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_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index e02566fca6d..2e54cd3505c 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.
@@ -350,8 +302,8 @@ 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:
+	case TAO_CodeGen::TAO_ROOT_IS:
+	case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -425,8 +377,8 @@ 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:
+	case TAO_CodeGen::TAO_ROOT_IS:
+	case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -577,9 +529,9 @@ 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
+	case TAO_CodeGen::TAO_ROOT_IS:
+	case TAO_CodeGen::TAO_ROOT_IH:
+		return 0; // nothing to be done
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -613,149 +565,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 +688,8 @@ 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:
+	case TAO_CodeGen::TAO_ROOT_IS:
+	case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -954,8 +763,8 @@ 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:
+	case TAO_CodeGen::TAO_ROOT_IS:
+	case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -1029,8 +838,8 @@ 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:
+	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/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 78af3073c5f..26d99d9e015 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:
@@ -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_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/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..afc76487baa 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
@@ -117,13 +117,13 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
   if (this->gen_extraction (os, node) != 0)
     return -1;
 
-  *os << be_nl
-      << "return 1;" << be_uidt_nl
+  *os << "return 1;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "ACE_CATCHANY" << be_nl
       << "{" << be_idt_nl
-      << "delete _tao_elem;" << be_uidt_nl
+      << "delete _tao_elem;" << be_nl
+      << "return 0; " << be_uidt_nl
       << "}" << be_nl
       << "ACE_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
@@ -186,7 +186,7 @@ gen_insertion (TAO_OutStream *os,
       << "stream << *_any_val;" << be_nl
       << "_tao_any._tao_replace (" << be_idt << be_idt_nl
       << node->tc_name () << "," << be_nl
-      << "stream.begin ()," << be_nl
+      << "stream.begin ()->clone ()," << be_nl
       << "1," << be_nl
       << "_any_val," << be_nl
       << "ACE_TRY_ENV" << be_uidt_nl
@@ -204,7 +204,7 @@ gen_insertion_nocopy (TAO_OutStream *os,
       << "stream << *_tao_elem;" << be_nl
       << "_tao_any._tao_replace (" << be_idt << be_idt_nl
       << node->tc_name () << "," << be_nl
-      << "stream.begin ()," << be_nl
+      << "stream.begin ()->clone ()," << be_nl
       << "1," << be_nl
       << "_tao_elem," << be_nl
       << "ACE_TRY_ENV" << be_uidt_nl
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..6cd34f2b473 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -215,7 +215,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/public_access_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
index 054dcd7dadf..de032dbda1c 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
@@ -171,20 +171,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 +187,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_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..98e8e6164d2 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
@@ -963,7 +963,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       *os << ";" << be_nl;
 
       *os << "this->u_."
-          << ub->local_name () << "_ = new " << bt->name ()
+          << ub->local_name () << "_var = new " << bt->name ()
           << " (val);" << be_nl;
     }
   else
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/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..e87d9bdd1d2 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/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..d05d0e69015 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -53,6 +53,12 @@ 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
 
@@ -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..e74390ca4b0 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -37,6 +37,12 @@ public:
                    UTL_StrList *p);
   // constructor
 
+  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
+
   int gen_label_value (TAO_OutStream *os);
   // Generate the label value (as in a switch/case statement).
 
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_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/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 9f09ca74382..1c60e0547c7 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,9 +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");
@@ -284,7 +278,7 @@ DRV_parse_args (long ac, char **av)
                   // I expect 's' or 'i' after 'c'.
                   cerr << GTDEVEL("Incomplete Flag : ")
                        << av[i];
-                  ACE_OS::exit (99);
+                  exit(99);
                 }
               break;
 
@@ -383,13 +377,13 @@ DRV_parse_args (long ac, char **av)
               idl_global->output_dir (av [i+1]);
               i++;
               break;
-
-              // Temp directory for the IDL compiler to keep its files.
+            
+              // 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':
@@ -536,16 +530,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 '")
@@ -572,22 +559,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;
@@ -701,26 +679,18 @@ 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);
+              
+      if (tmpdir != 0)
+        idl_global->temp_dir (tmpdir);
+      else
+        idl_global->temp_dir (ACE_DIRECTORY_SEPARATOR_STR_A
+                              "tmp"
+                              ACE_DIRECTORY_SEPARATOR_STR_A);
     }
 }
 
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..747fdfa20c0 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;
 }
 
@@ -311,7 +259,7 @@ DRV_pre_proc(char *myfile)
 
   ACE_OS::strcpy (tmp_file, tmpdir);
   ACE_OS::strcpy (tmp_ifile, tmpdir);
-
+  
   ACE_OS::strcat (tmp_file, "idlf_XXXXXX");
   ACE_OS::strcat (tmp_ifile, "idli_XXXXXX");
 
@@ -401,7 +349,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,7 +364,7 @@ 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)
@@ -425,12 +373,12 @@ DRV_pre_proc(char *myfile)
          << 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
@@ -515,10 +463,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
index 3fdc82246d3..11f9ce72a1b 100644
--- a/TAO/TAO_IDL/fe/Makefile.am
+++ b/TAO/TAO_IDL/fe/Makefile.am
@@ -57,7 +57,6 @@ lex.yy.cpp.target:
             -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
@@ -93,3 +92,4 @@ EXTRA_DIST = idl.ll idl.yy keywords.dat y.tab.cpp.diff
 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/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index c8d3e4ff3a7..2b976240b61 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -1,6 +1,6 @@
 
 %{
-/*  $Id$
+/*
 
 COPYRIGHT
 
@@ -93,19 +93,6 @@ 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 */
@@ -146,14 +133,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 +156,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)
       {
@@ -393,7 +372,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 +534,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 +550,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..45d2762f2b8 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 */
@@ -1427,15 +1219,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 +1255,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 +2124,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/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 6fde2156aba..2882bc235d5 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -281,47 +281,41 @@ 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[288] =
     {   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,   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,   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,   56,    0,    0,    0,
+       40,   40,   40,    4,   15,   24,    0,    0,    0,    5,
+        6,    8,   54,    0,   51,   51,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
@@ -366,224 +360,204 @@ static tao_yyconst int tao_yy_meta[56] =
         5,    5,    5,    5,    5
     } ;
 
-static tao_yyconst short int tao_yy_base[351] =
+static tao_yyconst short int tao_yy_base[300] =
     {   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,  468,  474,  476,   54,  476,  476,  467,  441,   46,
+       54,   54,   59,  454,  452,  450,    0,  448,  441,   14,
+      421,   32,   41,   35,  423,  420,  418,  417,  428,   48,
+       57,   45,  405,  415,  413,   52,  107,   95,  451,  476,
+      448,  105,  102,  114,  476,   99,  146,  128,  158,  171,
+        0,  177,  476,  476,  476,    0,  430,  425,  398,  402,
+      406,  401,  416,  404,  409,  395,  394,  409,  398,   43,
+      398,  405,  390,  389,  401,  387,  395,  402,  387,  388,
+      384,  390,  384,   66,  388,  388,  377,  384,  476,   99,
+      193,  389,  383,  375,  476,  414,  413,  119,  412,  134,
+
+      476,  142,    0,  190,  476,  161,  196,    0,  392,  396,
+        0,  369,  374,  378,  366,  105,  380,  378,  368,  373,
+      376,  357,  370,  367,  354,  363,  366,  349,    0,  352,
+      364,  348,  350,  106,  347,  359,  350,  353,  357,  359,
+      343,  384,  383,  351,  343,  353,  476,  476,  208,  377,
+      210,  214,  476,  362,    0,  342,  345,    0,    0,  331,
+      343,  328,  336,    0,  331,  326,  325,  326,    0,  331,
+      320,  321,  337,  332,  323,  330,  316,  321,  329,  328,
+      326,  317,  321,    0,  311,  317,  351,  228,  312,  318,
+      315,  476,  345,  476,  344,    0,  317,  317,    0,  295,
+
+      306,  310,  296,    0,    0,  307,  307,  306,    0,  287,
+      292,  296,  295,    0,  299,  287,  296,  298,    0,  290,
+        0,  289,  476,  232,  282,  239,  288,  247,  247,  228,
+      224,    0,  231,  236,    0,    0,    0,    0,  226,  224,
+        0,    0,    0,  213,  208,  201,  476,  246,  160,  261,
+      265,  268,  194,  170,    0,    0,    0,  172,  178,  139,
+      153,    0,  122,    0,  163,  476,  175,  146,  125,  213,
+       88,   62,   67,    0,    0,    0,   74,  199,  239,    0,
+        0,    0,  476,  254,  476,  261,  476,  284,  289,  291,
+      296,  301,   53,  304,  308,  311,  315,  320,  325
+
     } ;
 
-static tao_yyconst short int tao_yy_def[351] =
+static tao_yyconst short int tao_yy_def[300] =
     {   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
+      287,    1,  287,  287,  287,  287,  287,  288,  289,  287,
+      287,  287,  287,  287,  287,  287,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  287,  287,  288,  287,
+      287,  291,  287,  287,  287,  292,  287,  287,  287,  287,
+      293,  287,  287,  287,  287,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,   37,  287,   37,
+      287,  287,  287,  287,  287,  287,  287,  287,  294,  292,
+
+      287,  292,   47,  287,  287,  287,  287,  293,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  295,  287,  287,  287,  287,  287,  287,  287,  296,
+      287,  287,  287,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  295,  287,  287,  287,
+      287,  287,  287,  287,  287,  290,  290,  290,  290,  290,
+
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  287,  287,  287,  287,  287,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  290,  290,  287,  287,  297,  287,
+      287,  287,  287,  290,  290,  290,  290,  290,  290,  290,
+      290,  290,  290,  290,  297,  287,  297,  298,  287,  287,
+      290,  290,  290,  290,  290,  290,  298,  287,  299,  290,
+      290,  290,  287,  299,  287,  299,    0,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287
+
     } ;
 
-static tao_yyconst short int tao_yy_nxt[582] =
+static tao_yyconst short int tao_yy_nxt[532] =
     {   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
+       26,   27,   28,   29,   30,   17,   17,   31,   32,   33,
+       34,   35,   36,   17,   17,   38,  108,   59,   38,   43,
+       44,   44,   45,   60,   62,   47,   46,   48,   48,   49,
+       47,   63,   52,   52,   52,   50,   64,   65,   67,  278,
+       50,   79,   74,   51,   80,   66,   86,  122,   68,   77,
+       50,   75,  123,   78,   81,   50,   38,   82,   76,   38,
+
+       87,  101,  102,  282,  142,  281,  137,   51,   88,   89,
+       89,   90,   97,   47,  138,   48,   48,   49,   98,   98,
+       91,   91,   91,   50,  280,   47,  148,   52,   52,   52,
+      268,   51,  149,  149,   99,   50,  101,  102,   50,   47,
+      287,   48,   48,   49,  101,  102,  178,   92,   93,   50,
+       50,  278,   94,  160,  161,   51,  179,  276,   99,  103,
+      103,  103,  266,  267,   50,  266,  267,  104,  105,   47,
+      105,   49,   49,   49,  107,  107,  107,  266,  267,   50,
+      106,  106,  104,  105,  107,  107,  107,  105,   47,  275,
+       52,   52,   52,  274,   50,   89,   89,  143,   50,  151,
+
+      151,  283,  283,  152,  152,  152,   91,   91,   91,  107,
+      107,  107,  273,   50,  279,  192,  272,  279,  153,  271,
+      153,  193,  193,  152,  152,  152,  270,  152,  152,  152,
+      223,  223,  224,  153,  247,  247,  105,  153,  105,  264,
+      250,  285,  286,  251,  263,  248,  248,  248,  247,  247,
+      262,  105,  252,  252,  252,  105,  285,  286,  261,  248,
+      248,  248,  250,  285,  286,  251,  250,  260,  259,  251,
+      268,  258,  269,  257,  252,  252,  252,  256,  252,  252,
+      252,  252,  252,  252,   39,   39,   39,   39,   39,   41,
+      255,   41,   41,   41,   56,   56,   96,  254,   96,   96,
+
+       96,  100,  100,  100,  100,  100,  150,  150,  187,  187,
+      187,  187,  187,  195,  195,  265,  265,  265,  265,  265,
+      277,  277,  277,  277,  277,  284,  284,  284,  284,  284,
+      253,  249,  246,  245,  244,  243,  242,  241,  240,  239,
+      238,  237,  236,  235,  234,  233,  232,  231,  230,  229,
+      228,  194,  192,  227,  226,  225,  188,  222,  221,  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,  194,  191,  190,  189,  142,  188,
+      186,  185,  184,  183,  182,  181,  180,  177,  176,  175,
+
+      174,  173,  172,  171,  170,  169,  168,  167,  166,  165,
+      164,  163,  162,  159,  158,  157,  156,  155,  154,  147,
+      147,  147,  146,  145,  144,  287,  141,  140,  139,  136,
+      135,  134,  133,  132,  131,  130,  129,  128,  127,  126,
+      125,  124,  121,  120,  119,  118,  117,  116,  115,  114,
+      113,  112,  111,  110,  109,   95,   40,   85,   84,   83,
+       73,   72,   71,   70,   69,   61,   58,   57,   55,   54,
+       53,   42,   40,  287,   37,    3,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287
     } ;
 
-static tao_yyconst short int tao_yy_chk[582] =
+static tao_yyconst short int tao_yy_chk[532] =
     {   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,
+        1,    1,    1,    1,    1,    5,  293,   20,    5,   10,
+       10,   10,   11,   20,   22,   12,   11,   12,   12,   12,
+       13,   22,   13,   13,   13,   12,   22,   23,   24,  277,
+       13,   32,   30,   12,   32,   23,   36,   70,   24,   31,
+       12,   30,   70,   31,   32,   13,   38,   32,   30,   38,
+
+       36,   46,   46,  273,   90,  272,   84,   12,   37,   37,
+       37,   37,   42,   43,   84,   43,   43,   43,   42,   42,
+       37,   37,   37,   43,  271,   44,   98,   44,   44,   44,
+      269,   43,   98,   98,   42,   44,  100,  100,   43,   48,
+       90,   48,   48,   48,  102,  102,  134,   37,   37,   48,
+       44,  268,   37,  116,  116,   43,  134,  263,   42,   47,
+       47,   47,  249,  249,   48,  265,  265,   47,   47,   49,
+       47,   49,   49,   49,  106,  106,  106,  267,  267,   49,
+       50,   50,   47,   47,   50,   50,   50,   47,   52,  261,
+       52,   52,   52,  260,   49,   91,   91,   91,   52,  104,
+
+      104,  278,  278,  104,  104,  104,   91,   91,   91,  107,
+      107,  107,  259,   52,  270,  149,  258,  270,  107,  254,
+      107,  149,  149,  151,  151,  151,  253,  152,  152,  152,
+      188,  188,  188,  107,  224,  224,  152,  107,  152,  246,
+      226,  279,  279,  226,  245,  224,  224,  224,  248,  248,
+      244,  152,  226,  226,  226,  152,  284,  284,  240,  248,
+      248,  248,  250,  286,  286,  250,  251,  239,  234,  251,
+      251,  233,  252,  231,  250,  250,  250,  230,  251,  251,
+      251,  252,  252,  252,  288,  288,  288,  288,  288,  289,
+      229,  289,  289,  289,  290,  290,  291,  228,  291,  291,
+
+      291,  292,  292,  292,  292,  292,  294,  294,  295,  295,
+      295,  295,  295,  296,  296,  297,  297,  297,  297,  297,
+      298,  298,  298,  298,  298,  299,  299,  299,  299,  299,
+      227,  225,  222,  220,  218,  217,  216,  215,  213,  212,
+      211,  210,  208,  207,  206,  203,  202,  201,  200,  198,
+      197,  195,  193,  191,  190,  189,  187,  186,  185,  183,
+      182,  181,  180,  179,  178,  177,  176,  175,  174,  173,
+      172,  171,  170,  168,  167,  166,  165,  163,  162,  161,
+      160,  157,  156,  154,  150,  146,  145,  144,  143,  142,
+      141,  140,  139,  138,  137,  136,  135,  133,  132,  131,
+
+      130,  128,  127,  126,  125,  124,  123,  122,  121,  120,
+      119,  118,  117,  115,  114,  113,  112,  110,  109,   99,
+       97,   96,   94,   93,   92,   88,   87,   86,   85,   83,
+       82,   81,   80,   79,   78,   77,   76,   75,   74,   73,
+       72,   71,   69,   68,   67,   66,   65,   64,   63,   62,
+       61,   60,   59,   58,   57,   41,   39,   35,   34,   33,
        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
+       14,    9,    8,    3,    2,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
+      287
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -605,7 +579,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,19 +672,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
 
@@ -850,7 +811,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 +826,7 @@ TAO_YY_DECL
 	register char *tao_yy_cp, *tao_yy_bp;
 	register int tao_yy_act;
 
-#line 117 "fe/idl.ll"
+#line 104 "fe/idl.ll"
 
 
 
@@ -919,13 +880,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 >= 288 )
 					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] != 476 );
 
 tao_yy_find_action:
 		tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -953,245 +914,205 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 TAO_YY_RULE_SETUP
-#line 119 "fe/idl.ll"
+#line 106 "fe/idl.ll"
 return IDL_ANY;
 	TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
-#line 120 "fe/idl.ll"
+#line 107 "fe/idl.ll"
 return IDL_MODULE;
 	TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
-#line 121 "fe/idl.ll"
+#line 108 "fe/idl.ll"
 return IDL_RAISES;
 	TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
-#line 122 "fe/idl.ll"
+#line 109 "fe/idl.ll"
 return IDL_READONLY;
 	TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
-#line 123 "fe/idl.ll"
+#line 110 "fe/idl.ll"
 return IDL_ATTRIBUTE;
 	TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
-#line 124 "fe/idl.ll"
+#line 111 "fe/idl.ll"
 return IDL_EXCEPTION;
 	TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
-#line 125 "fe/idl.ll"
+#line 112 "fe/idl.ll"
 return IDL_CONTEXT;
 	TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
-#line 126 "fe/idl.ll"
+#line 113 "fe/idl.ll"
 return IDL_INTERFACE;
 	TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
-#line 127 "fe/idl.ll"
+#line 114 "fe/idl.ll"
 return IDL_CONST;
 	TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
-#line 128 "fe/idl.ll"
+#line 115 "fe/idl.ll"
 return IDL_TYPEDEF;
 	TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
-#line 129 "fe/idl.ll"
+#line 116 "fe/idl.ll"
 return IDL_STRUCT;
 	TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
-#line 130 "fe/idl.ll"
+#line 117 "fe/idl.ll"
 return IDL_ENUM;
 	TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
-#line 131 "fe/idl.ll"
+#line 118 "fe/idl.ll"
 return IDL_STRING;
 	TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
-#line 132 "fe/idl.ll"
+#line 119 "fe/idl.ll"
 return IDL_WSTRING;
 	TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
-#line 133 "fe/idl.ll"
+#line 120 "fe/idl.ll"
 return IDL_SEQUENCE;
 	TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
-#line 134 "fe/idl.ll"
+#line 121 "fe/idl.ll"
 return IDL_UNION;
 	TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
-#line 135 "fe/idl.ll"
+#line 122 "fe/idl.ll"
 return IDL_SWITCH;
 	TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
-#line 136 "fe/idl.ll"
+#line 123 "fe/idl.ll"
 return IDL_CASE;
 	TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
-#line 137 "fe/idl.ll"
+#line 124 "fe/idl.ll"
 return IDL_DEFAULT;
 	TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
-#line 138 "fe/idl.ll"
+#line 125 "fe/idl.ll"
 return IDL_FLOAT;
 	TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
-#line 139 "fe/idl.ll"
+#line 126 "fe/idl.ll"
 return IDL_DOUBLE;
 	TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
-#line 140 "fe/idl.ll"
+#line 127 "fe/idl.ll"
 return IDL_LONG;
 	TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
-#line 141 "fe/idl.ll"
+#line 128 "fe/idl.ll"
 return IDL_SHORT;
 	TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
-#line 142 "fe/idl.ll"
+#line 129 "fe/idl.ll"
 return IDL_UNSIGNED;
 	TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
-#line 143 "fe/idl.ll"
+#line 130 "fe/idl.ll"
 return IDL_CHAR;
 	TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
-#line 144 "fe/idl.ll"
+#line 131 "fe/idl.ll"
 return IDL_WCHAR;
 	TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
-#line 145 "fe/idl.ll"
+#line 132 "fe/idl.ll"
 return IDL_BOOLEAN;
 	TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
-#line 146 "fe/idl.ll"
+#line 133 "fe/idl.ll"
 return IDL_OCTET;
 	TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
-#line 147 "fe/idl.ll"
+#line 134 "fe/idl.ll"
 return IDL_VOID;
 	TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
-#line 148 "fe/idl.ll"
+#line 135 "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 137 "fe/idl.ll"
 return IDL_TRUETOK;
 	TAO_YY_BREAK
-case 40:
+case 32:
 TAO_YY_RULE_SETUP
-#line 159 "fe/idl.ll"
+#line 138 "fe/idl.ll"
 return IDL_FALSETOK;
 	TAO_YY_BREAK
-case 41:
+case 33:
 TAO_YY_RULE_SETUP
-#line 161 "fe/idl.ll"
+#line 140 "fe/idl.ll"
 return IDL_INOUT;
 	TAO_YY_BREAK
-case 42:
+case 34:
 TAO_YY_RULE_SETUP
-#line 162 "fe/idl.ll"
+#line 141 "fe/idl.ll"
 return IDL_IN;
 	TAO_YY_BREAK
-case 43:
+case 35:
 TAO_YY_RULE_SETUP
-#line 163 "fe/idl.ll"
+#line 142 "fe/idl.ll"
 return IDL_OUT;
 	TAO_YY_BREAK
-case 44:
+case 36:
 TAO_YY_RULE_SETUP
-#line 164 "fe/idl.ll"
+#line 143 "fe/idl.ll"
 return IDL_ONEWAY;
 	TAO_YY_BREAK
-case 45:
+case 37:
 TAO_YY_RULE_SETUP
-#line 166 "fe/idl.ll"
+#line 145 "fe/idl.ll"
 return IDL_LEFT_SHIFT;
 	TAO_YY_BREAK
-case 46:
+case 38:
 TAO_YY_RULE_SETUP
-#line 167 "fe/idl.ll"
+#line 146 "fe/idl.ll"
 return IDL_RIGHT_SHIFT;
 	TAO_YY_BREAK
-case 47:
+case 39:
 TAO_YY_RULE_SETUP
-#line 168 "fe/idl.ll"
+#line 147 "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 152 "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 +1120,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 +1133,49 @@ TAO_YY_RULE_SETUP
     return IDENTIFIER;
 }
 	TAO_YY_BREAK
-case 49:
+case 41:
 TAO_YY_RULE_SETUP
-#line 193 "fe/idl.ll"
+#line 172 "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 176 "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 181 "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 185 "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 189 "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 194 "fe/idl.ll"
 {
 		  /* Skip the quotes */
 		  char *tmp = ace_tao_yytext;
@@ -1263,95 +1184,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 201 "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 205 "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 210 "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 215 "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 219 "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 223 "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 226 "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 229 "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 232 "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 235 "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 239 "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 243 "fe/idl.ll"
 {
 		  for(;;) {
 		    char c = tao_yyinput();
@@ -1366,29 +1287,29 @@ TAO_YY_RULE_SETUP
 		    }
 	          }
 	        }
-	break;
-case 67:
+	TAO_YY_BREAK
+case 59:
 TAO_YY_RULE_SETUP
-#line 278 "fe/idl.ll"
+#line 257 "fe/idl.ll"
 ;
-	break;
-case 68:
+	TAO_YY_BREAK
+case 60:
 TAO_YY_RULE_SETUP
-#line 279 "fe/idl.ll"
+#line 258 "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 261 "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 263 "fe/idl.ll"
 TAO_YY_ECHO;
-	break;
+	TAO_YY_BREAK
 case TAO_YY_STATE_EOF(INITIAL):
 	tao_yyterminate();
 
@@ -1681,7 +1602,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 >= 288 )
 				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 +1637,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 >= 288 )
 			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 == 287);
 
 	return tao_yy_is_jam ? 0 : tao_yy_current_state;
 	}
@@ -2276,7 +2197,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 284 "fe/idl.ll"
+#line 263 "fe/idl.ll"
 
 	/* subroutines */
 
@@ -2389,7 +2310,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 +2472,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 +2488,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..5240ad07aef 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,6 +1,6 @@
 // $Id$
 #ifndef lint
-char tao_yysccsid[] = "@(#)yaccpar      1.4 (Berkeley) 02/25/90 \n\
+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"
@@ -10,8 +10,8 @@ char tao_yysccsid[] = "@(#)yaccpar      1.4 (Berkeley) 02/25/90 \n\
 #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);
@@ -23,34 +23,32 @@ extern int tao_yyleng;
 #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           */
+  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      */
+  String		*sval;		/* String value		*/
+  char			*strval;	/* char * value		*/
+  Identifier		*idval;		/* Identifier		*/
+  UTL_IdList		*idlist;	/* Identifier list	*/
 } TAO_YYSTYPE;
-#line 53 "y.tab.cpp"
+#line 51 "y.tab.cpp"
 #define IDENTIFIER 257
 #define IDL_CONST 258
 #define IDL_MODULE 259
@@ -87,459 +85,382 @@ typedef union {
 #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 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
 #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,
+    0,   67,   67,   69,   68,   71,   68,   73,   68,   75,
+   68,   77,   68,   78,   68,   79,   80,   81,   82,   76,
+   74,   74,   85,   87,   88,   83,   89,   64,   32,   90,
+   22,   22,   86,   86,   92,   91,   93,   91,   94,   91,
+   96,   91,   98,   91,   99,   91,   20,  100,   21,   21,
+   16,  101,   16,  102,   16,   65,   84,  103,  104,  105,
+  106,   70,   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,  109,  107,
+    1,    1,    2,    2,    2,   56,   56,   56,   56,   56,
+   56,    4,    4,    4,    3,    3,    3,   28,  110,   29,
+   29,   60,   60,   30,  111,   31,   31,   61,   62,   49,
+   49,   54,   54,   54,   55,   55,   55,   52,   52,   52,
+   50,   50,   57,   51,   53,  112,  113,  115,  116,    7,
+  114,  118,  118,  119,  120,  117,  121,  117,  122,  123,
+  124,  125,  126,  127,  129,  130,   10,    9,    9,    9,
+    9,    9,    9,  128,  132,  132,  133,  134,  131,  135,
+  131,   26,   27,   27,  136,   46,  137,  138,   46,  139,
+   47,  140,  141,  143,  144,    8,  142,  147,  146,  146,
+  145,  148,  149,    5,    5,  150,  151,   13,  153,  154,
+    6,    6,  152,  156,  157,   14,   14,  155,  158,   11,
+   24,   25,   25,  159,  160,   45,  161,  162,   95,   63,
+   63,  163,  164,  165,  166,   72,  167,  169,  170,  171,
+   97,   59,   59,   59,   12,   12,  172,  168,  174,  168,
+  173,  177,  176,  176,  178,  179,  175,   15,   15,   15,
+   58,   58,   58,  180,  181,   23,   23,  182,  183,   17,
+   17,   18,  184,   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,
+    3,    0,    3,    0,    3,    0,    0,    0,    0,    9,
+    1,    1,    0,    0,    0,    7,    0,    3,    2,    0,
+    3,    0,    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,    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,
+    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,    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,    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,
+   14,   58,   16,   27,  103,  156,  169,  202,  242,    0,
+    0,  105,  107,  106,   23,    0,    4,    1,    0,    6,
+    8,   10,   12,   21,   22,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   56,  108,  138,    0,   30,   29,
+    0,    2,    0,    0,    0,    0,   15,    0,  144,    0,
+  148,  149,  151,  152,  153,  154,  223,  228,   52,   68,
+   69,    0,   59,   63,   64,   66,   67,  140,  141,   65,
+   51,    0,    0,   17,   28,  155,  216,  109,  111,  112,
+  114,  122,  123,  125,  127,  126,    0,  124,    0,  116,
+  118,  119,  117,  121,  113,  120,  104,  157,  170,  203,
+  243,   24,    0,    5,    7,    9,   11,   13,  143,  150,
+    0,  147,    0,   54,    0,  219,  224,    0,    0,    0,
+  212,  215,    0,    0,    0,    0,   34,    0,   31,  146,
+   53,    0,   60,    0,    0,   18,  217,  139,  110,  131,
+  132,  133,    0,    0,  158,  171,  204,  244,    0,    0,
+   55,    0,   96,   97,   98,   99,  100,  101,    0,    0,
+    0,    0,    0,  102,    0,    0,    0,    0,    0,    0,
+   85,   89,   94,  220,  225,    0,    0,    0,    0,  213,
+    0,    0,    0,  163,   45,  240,  252,  253,    0,    0,
+   35,   37,   39,    0,   33,   41,   43,   48,   61,   90,
+   91,   92,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   19,  218,  129,  234,  230,
+  233,    0,  167,  164,  159,  163,  172,  211,  205,  210,
+    0,    0,  256,  269,  247,  255,    0,  268,  237,    0,
+    0,    0,   26,    0,    0,    0,    0,   95,    0,    0,
+    0,    0,    0,    0,    0,   86,   87,   88,  221,  226,
+    0,    0,    0,    0,  214,    0,    0,    0,    0,    0,
+    0,    0,  162,    0,   46,    0,    0,   36,   38,   40,
+   42,   44,    0,   62,   71,   20,  130,  235,  232,  168,
+  165,  160,    0,  182,  173,    0,  178,  179,  181,  180,
+  206,  208,  246,  248,  238,    0,    0,    0,    0,    0,
+    0,  236,  166,  174,  209,    0,  249,  239,  137,    0,
+    0,    0,    0,    0,  175,  258,  271,  272,  273,  265,
+    0,  264,  274,  250,  135,    0,    0,  260,    0,    0,
+    0,    0,  190,  197,  195,  187,  194,  176,  186,  266,
+  262,  275,  278,  251,  136,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  191,  198,  196,  200,
+  188,  193,  177,  185,  267,  263,    0,  279,    0,    0,
+    0,  276,    0,  199,  201,  189,  285,    0,    0,  280,
+  283,    0,  284,
 };
-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_yydgoto[] = {                                      11,
+  224,   79,   80,   81,   82,   83,   84,   85,  295,   86,
+  138,  235,   87,   88,  236,  163,  354,  388,  389,  129,
+  150,   40,  334,  220,  264,  346,  360,  139,  178,  318,
+  324,   15,  284,  164,  165,  166,  167,  168,  169,  170,
+  171,  172,  173,  174,  221,  347,  371,   63,   90,   91,
+   92,   93,   94,   68,   69,   95,   96,  330,  189,  140,
+  141,  142,  190,   16,   71,   17,   18,   19,   41,   20,
+   43,   21,   44,   22,   45,   23,   46,   26,   28,  118,
+  176,  261,   24,   25,   38,  149,  127,  194,   29,  103,
+  195,  240,  241,  242,  196,  244,  197,  245,  232,  246,
+  113,  132,   27,  115,  152,  247,   97,   30,  120,  262,
+  342,   31,  123,  225,  181,  268,  273,  231,  267,  307,
+  266,   32,  124,  182,  270,  308,  320,  348,  336,  361,
+  349,  362,  359,  381,  356,  358,  357,  379,  380,   33,
+  125,  229,  183,  271,  230,  272,  309,  144,  222,  119,
+  177,   72,  134,  214,   73,  135,  215,  179,  263,  306,
+  277,  311,   34,  126,  184,  274,  276,  317,  310,  323,
+  341,  321,  331,  322,  332,  339,  364,  337,  363,  340,
+  365,  366,  383,  392,
 };
-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,
+short tao_yysindex[] = {                                    333,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, -194,
+    0,    0,    0,    0,    0,   10,    0,    0,  333,    0,
+    0,    0,    0,    0,    0,   25,  254, -177, -194,  162,
+ -194, -194, -194, -194,    0,    0,    0,  -34,    0,    0,
+   47,    0,   52,   61,   78,  103,    0,  -54,    0, -187,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, -131,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  126,  150,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   77,    0, -131,    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,
+    0,    0, -183,    0,    0,    0,    0,    0,    0,    0,
+  -90,    0, -194,    0, -194,    0,    0,   72,  152, -194,
+    0,    0,   95,  -53,  119,  122,    0, -131,    0,    0,
+    0, -194,    0,   26,   26,    0,    0,    0,    0,    0,
+    0,    0,    0,   26,    0,    0,    0,    0,  303,  212,
+    0,  209,    0,    0,    0,    0,    0,    0,  -30,  -30,
+  -30,   26, -131,    0,  156,  182,  246, -154,  159,   89,
+    0,    0,    0,    0,    0,  333,  211,  242,  196,    0,
+  137,  248,   32,    0,    0,    0,    0,    0,  228,   13,
+    0,    0,    0,  165,    0,    0,    0,    0,    0,    0,
+    0,    0,  250,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,  230,  235,    0,    0,    0,    0,    0,
+    0,  236,    0,    0,    0,    0,    0,    0,    0,    0,
+  137,  243,    0,    0,    0,    0, -131,    0,    0,  245,
+  247,  249,    0,  251,  253, -183,   26,    0,  182,  246,
+ -154,  159,  159,   89,   89,    0,    0,    0,    0,    0,
+  180, -194,   26,  196,    0,  257, -194,  188,  137,  287,
+  192,  263,    0,  193,    0,   71,  271,    0,    0,    0,
+    0,    0, -131,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   67,    0,    0, -131,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  238,  277,  296,   32,  298,
+ -194,    0,    0,    0,    0,    0,    0,    0,    0,  219,
+  302,  -63,   55,  300,    0,    0,    0,    0,    0,    0,
+  305,    0,    0,    0,    0,  -74,  271,    0,  304,  307,
+   58, -194,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  293,   26,  297,  162, -102,
+  229,  -74, -194,  -63, -183,  318,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  319,    0,  301, -194,
+  306,    0,   69,    0,    0,    0,    0,  323,  324,    0,
+    0,   79,    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,
+short tao_yyrindex[] = {                                    371,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  -27,    0,    0,   17,    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,  -19,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -24,    0,    0,    0,    0,
+    0,  115,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   28,   38,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   57,    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,
+    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    4,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   94,    0,    0,    0,    0,    0,  112,    9,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  -29,    0,   99,  129,  155,  107,   50,   -7,
+    0,    0,    0,    0,    0,  259,    0,  326,    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,
+  261,    0,    0,    0,    0,    0,  130,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  157,  268,
+  135,   56,   66,   -1,   40,    0,    0,    0,    0,    0,
+    0,    0,    0,  140,    0,    0,    0,    0,  265,    0,
+    0,  266,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   18,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  347,    0,    0,  355,    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,  -14,    0,    0,    0,    0,
+    0,    0,  -56,  338,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  375,    0,
+  251,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  187,
+    0,  292,    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,  441,
-    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  377,    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,
+  -24,  244,    0,    0,    0,  -22,   54,    7,    0,   60,
+    0,    0,    0,  393, -207,  -26,    0,    0,    0,   76,
+    0,    0,    0,    0,    0,    0,    0,  175,    0,    0,
+    0,    0,    0, -134,    0,  218,  240,  217,   39,   51,
+   21,   80,    0,  -88,  179,   86,    0,    0,  -16,  -12,
+    8,  420,    0,    0,    0, -148,   12,    0,    0, -209,
+   -8,    0,    0,    0,  -10,  299,    1,    0,    0,  317,
+    0,  320,    0,    0,    0,    0,    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,  286,  258,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  160,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  108,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  163,    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,
+    0,    0,    0,    0,  136,    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,
+#define TAO_YYTABLESIZE 625
+short tao_yytable[] = {                                      37,
+   62,   36,  277,   89,   60,   78,   13,   93,   93,  162,
+   64,   93,   93,   93,   65,   93,    3,   93,   75,   42,
+   98,   99,  100,  101,  142,   13,  257,  203,   93,   93,
+   82,   57,   93,   82,   66,   82,   83,   82,   70,   83,
+  238,   83,  142,   83,   50,  145,  175,   50,  145,   47,
+   82,   82,  287,   12,   82,  180,   83,   83,   49,   14,
+   83,   49,   35,   93,   93,  162,  145,   39,  159,  305,
+  160,  222,   12,   35,  111,  112,  128,   84,   14,   74,
+   84,  227,   84,   47,   84,   82,   82,   79,  102,  222,
+   79,   83,   83,   80,   93,   32,   80,   84,   84,  227,
+  115,   84,  131,   81,  133,  104,   81,   79,   79,  143,
+  105,   79,  285,   80,   80,   59,   82,   80,  115,  106,
+  121,  151,   83,   81,   81,  213,   50,   81,  238,  350,
+  211,   47,   84,   84,  138,  212,  107,  138,  122,   72,
+   49,    3,   79,   79,   77,  207,  208,   77,   80,   80,
+   89,  161,  138,  375,   89,   13,   72,   72,   81,   81,
+   72,  108,  237,   84,   77,   77,  234,  114,   77,   73,
+  385,  130,   78,   79,  288,   78,  216,  344,  345,   80,
+  231,  343,   13,  231,  229,  116,   73,   73,  238,   81,
+   73,   72,   78,   78,  136,   75,   78,   74,  231,   77,
+   77,  209,   12,  210,   89,  344,  345,  109,   14,  117,
+  110,  137,   75,   75,   74,   74,   75,  145,   74,  283,
+  146,   73,  368,  327,  328,  329,   35,   78,   78,   12,
+   77,  256,  257,  258,  277,   14,   25,  142,  200,  201,
+  202,  147,   89,  296,  148,  252,  253,   75,   75,   74,
+  237,  143,   73,  297,  234,  198,  143,  298,   78,  254,
+  255,  145,  153,  154,  155,  156,  157,  158,   59,  199,
+   93,   93,  259,  259,  259,  205,  294,  299,   75,  204,
+   74,  300,   35,  206,  222,  218,  219,  227,  228,  243,
+  248,  259,   82,   82,  227,  239,  260,  265,   83,   83,
+   37,  275,  319,  278,  286,  279,  302,  280,   76,  281,
+  237,  282,  292,  115,  234,  290,  301,  303,  153,  154,
+  155,  156,  157,  158,   59,   76,   76,  304,  109,   76,
+  312,   37,   89,  355,  370,  313,  314,  316,  128,   84,
+   84,  325,  326,  335,  333,  338,  352,  351,  353,   79,
+   79,  367,  143,  373,  369,   80,   80,  378,  384,  382,
+   76,   76,  387,  390,  386,   81,   81,  391,  254,  143,
+    3,   70,  393,  254,  254,  254,  254,  254,  254,  254,
+  254,  254,  254,    3,  128,  245,  270,  142,  254,  161,
+  207,   76,  223,   35,  241,  183,  134,  254,   48,   49,
+   50,   51,   52,   53,   54,   55,   56,   76,    6,    7,
+  254,    8,   77,   57,   58,  261,  184,  282,   35,   61,
+  217,  249,  251,   48,   49,   50,   51,   52,   53,   54,
+   55,   56,   76,    6,    7,   59,    8,   77,   57,   58,
+  377,  291,  289,  192,  250,  372,   67,  191,  192,  192,
+  192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+   59,  192,  192,  192,  192,  192,  226,   35,  193,  374,
+    0,  315,   48,   49,   50,   51,   52,   53,   54,   55,
+   56,   76,    0,  269,   35,  192,   77,   57,   58,   48,
+   49,   50,   51,   52,   53,   54,   55,   56,   76,  376,
+    0,    0,    0,    0,   57,    0,    0,    0,    0,   59,
+   35,    0,    0,  233,    0,   48,   49,   50,   51,   52,
+   53,   54,   55,   56,    0,    0,   59,   35,    0,    0,
+   57,   58,   48,   49,   50,   51,   52,   53,   54,   55,
+   56,   76,    0,   35,    0,    0,    0,   57,  293,   49,
+   50,    0,   59,   53,   54,   55,   56,    0,  185,    0,
+    2,    8,    0,    5,    0,    0,    0,    0,    0,   59,
+    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
+    0,    9,    0,    0,  186,   59,  187,  188,    1,    0,
+    2,    3,    4,    5,   10,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
+    0,    9,    0,    0,    0,    0,    0,    0,    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,
+   27,   10,   59,   30,   27,   30,    0,   37,   38,   40,
+   27,   41,   42,   43,   27,   45,    0,   47,   29,   19,
+   31,   32,   33,   34,   44,   19,   41,  162,   58,   59,
+   38,   59,   62,   41,   27,   43,   38,   45,   27,   41,
+  189,   43,   62,   45,   41,   41,  135,   44,   44,   41,
+   58,   59,  262,    0,   62,  144,   58,   59,   41,    0,
+   62,   44,  257,   93,   94,   40,   62,   58,   43,  277,
+   45,   44,   19,  257,  262,  263,  103,   38,   19,  257,
+   41,   44,   43,   59,   45,   93,   94,   38,  123,   62,
+   41,   93,   94,   38,  124,  123,   41,   58,   59,   62,
+   44,   62,  113,   38,  115,   59,   41,   58,   59,  120,
+   59,   62,  247,   58,   59,  299,  124,   62,   62,   59,
+   44,  132,  124,   58,   59,   37,  123,   62,  277,  337,
+   42,  123,   93,   94,   41,   47,   59,   44,   62,   41,
+  123,  125,   93,   94,   38,  300,  301,   41,   93,   94,
+  177,  126,   59,  363,  181,  149,   58,   59,   93,   94,
+   62,   59,  189,  124,   58,   59,  189,  299,   62,   41,
+  380,  262,   38,  124,  263,   41,  176,  280,  281,  124,
+   41,  256,  176,   44,   91,   60,   58,   59,  337,  124,
+   62,   93,   58,   59,  123,   41,   62,   41,   59,   93,
+   94,   43,  149,   45,  231,  280,  281,  262,  149,   60,
+  265,   60,   58,   59,   58,   59,   62,  123,   62,  246,
+  274,   93,  357,  287,  288,  289,  257,   93,   94,  176,
+  124,  211,  212,  213,  291,  176,  125,  257,  159,  160,
+  161,  123,  269,  270,  123,  207,  208,   93,   94,   93,
+  277,  262,  124,  270,  277,   44,  267,  270,  124,  209,
+  210,  257,  293,  294,  295,  296,  297,  298,  299,   61,
+  300,  301,  287,  288,  289,   94,  270,  270,  124,  124,
+  124,  270,  257,   38,  257,   44,   91,   40,  257,  125,
+   41,   62,  300,  301,  257,  283,   62,   62,  300,  301,
+  311,   59,  311,   59,  125,   59,   44,   59,   41,   59,
+  337,   59,  125,  257,  337,   59,  125,  125,  293,  294,
+  295,  296,  297,  298,  299,   58,   59,  257,  262,   62,
+   93,  342,  359,  342,  359,   59,   41,   40,  365,  300,
+  301,  123,   41,   44,  290,   41,   40,   44,  291,  300,
+  301,   59,  363,  125,   58,  300,  301,   40,   58,   41,
+   93,   94,  294,   41,   59,  300,  301,   44,  257,  380,
+    0,  257,  294,  262,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  125,   59,  125,  257,   41,  277,  125,
+  125,  124,  256,  257,  283,   41,   59,  286,  262,  263,
+  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
+  299,  275,  276,  277,  278,   41,  125,   41,  257,   27,
+  177,  204,  206,  262,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,  273,  299,  275,  276,  277,  278,
+  365,  267,  264,  257,  205,  360,   27,  149,  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,
+  299,  275,  276,  277,  278,  149,  181,  257,  149,  362,
+   -1,  309,  262,  263,  264,  265,  266,  267,  268,  269,
+  270,  271,   -1,  226,  257,  299,  276,  277,  278,  262,
+  263,  264,  265,  266,  267,  268,  269,  270,  271,  364,
+   -1,   -1,   -1,   -1,  277,   -1,   -1,   -1,   -1,  299,
+  257,   -1,   -1,  286,   -1,  262,  263,  264,  265,  266,
+  267,  268,  269,  270,   -1,   -1,  299,  257,   -1,   -1,
+  277,  278,  262,  263,  264,  265,  266,  267,  268,  269,
+  270,  271,   -1,  257,   -1,   -1,   -1,  277,  262,  263,
+  264,   -1,  299,  267,  268,  269,  270,   -1,  256,   -1,
+  258,  275,   -1,  261,   -1,   -1,   -1,   -1,   -1,  299,
+   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
+   -1,  279,   -1,   -1,  282,  299,  284,  285,  256,   -1,
+  258,  259,  260,  261,  292,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
+   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  292,
 };
-#define TAO_YYFINAL 14
+#define TAO_YYFINAL 11
 #ifndef TAO_YYDEBUG
 #define TAO_YYDEBUG 0
 #endif
-#define TAO_YYMAXTOKEN 309
+#define TAO_YYMAXTOKEN 301
 #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,
@@ -556,11 +477,9 @@ char *tao_yyname[] = {
 "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",
+"IDL_NATIVE","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",
@@ -578,89 +497,54 @@ char *tao_yyrule[] = {
 "$$5 :",
 "definition : module $$5 ';'",
 "$$6 :",
-"definition : value_def $$6 ';'",
+"definition : error $$6 ';'",
 "$$7 :",
-"definition : error $$7 ';'",
 "$$8 :",
 "$$9 :",
 "$$10 :",
-"$$11 :",
-"module : IDL_MODULE $$8 IDENTIFIER $$9 '{' $$10 definitions $$11 '}'",
+"module : IDL_MODULE $$7 IDENTIFIER $$8 '{' $$9 definitions $$10 '}'",
 "interface_def : interface",
 "interface_def : forward",
+"$$11 :",
 "$$12 :",
 "$$13 :",
+"interface : interface_header $$11 '{' $$12 exports $$13 '}'",
 "$$14 :",
-"interface : interface_header $$12 '{' $$13 exports $$14 '}'",
-"$$15 :",
-"interface_decl : IDL_INTERFACE $$15 id",
+"interface_decl : IDL_INTERFACE $$14 id",
 "interface_header : interface_decl inheritance_spec",
-"$$16 :",
-"inheritance_spec : ':' $$16 at_least_one_scoped_name",
+"$$15 :",
+"inheritance_spec : ':' $$15 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",
+"exports : exports export",
+"exports :",
+"$$16 :",
+"export : type_dcl $$16 ';'",
 "$$17 :",
+"export : const_dcl $$17 ';'",
 "$$18 :",
+"export : exception $$18 ';'",
 "$$19 :",
-"value_concrete_decl : value_header $$17 '{' $$18 value_elements $$19 '}'",
+"export : attribute $$19 ';'",
 "$$20 :",
+"export : operation $$20 ';'",
 "$$21 :",
+"export : error $$21 ';'",
+"at_least_one_scoped_name : scoped_name scoped_names",
 "$$22 :",
-"value_abs_decl : IDL_ABSTRACT value_header $$20 '{' $$21 exports $$22 '}'",
-"value_header : value_decl opt_truncatable inheritance_spec supports_spec",
+"scoped_names : scoped_names ',' $$22 scoped_name",
+"scoped_names :",
+"scoped_name : id",
 "$$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",
+"scoped_name : IDL_SCOPE_DELIMITOR $$23 id",
 "$$24 :",
-"state_member : IDL_PUBLIC $$24 member_i",
+"scoped_name : scoped_name IDL_SCOPE_DELIMITOR $$24 id",
+"id : IDENTIFIER",
+"forward : interface_decl",
 "$$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_dcl : IDL_CONST $$25 const_type $$26 id $$27 '=' $$28 expression",
 "const_type : integer_type",
 "const_type : char_type",
 "const_type : octet_type",
@@ -701,14 +585,14 @@ char *tao_yyrule[] = {
 "literal : IDL_TRUETOK",
 "literal : IDL_FALSETOK",
 "positive_int_expr : const_expr",
-"$$39 :",
-"type_dcl : IDL_TYPEDEF $$39 type_declarator",
+"$$29 :",
+"type_dcl : IDL_TYPEDEF $$29 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",
+"$$30 :",
+"type_declarator : type_spec $$30 at_least_one_declarator",
 "type_spec : simple_type_spec",
 "type_spec : constructed_type_spec",
 "simple_type_spec : base_type_spec",
@@ -727,14 +611,14 @@ char *tao_yyrule[] = {
 "constructed_type_spec : union_type",
 "constructed_type_spec : enum_type",
 "at_least_one_declarator : declarator declarators",
-"$$41 :",
-"declarators : declarators ',' $$41 declarator",
+"$$31 :",
+"declarators : declarators ',' $$31 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",
+"$$32 :",
+"simple_declarators : simple_declarators ',' $$32 simple_declarator",
 "simple_declarators :",
 "simple_declarator : id",
 "complex_declarator : array_declarator",
@@ -754,138 +638,135 @@ char *tao_yyrule[] = {
 "octet_type : IDL_OCTET",
 "boolean_type : IDL_BOOLEAN",
 "any_type : IDL_ANY",
+"$$33 :",
+"$$34 :",
+"$$35 :",
+"$$36 :",
+"struct_type : IDL_STRUCT $$33 id $$34 '{' $$35 at_least_one_member $$36 '}'",
+"at_least_one_member : member members",
+"members : members member",
+"members :",
+"$$37 :",
+"$$38 :",
+"member : type_spec $$37 at_least_one_declarator $$38 ';'",
+"$$39 :",
+"member : error $$39 ';'",
+"$$40 :",
+"$$41 :",
+"$$42 :",
 "$$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",
+"union_type : IDL_UNION $$40 id $$41 IDL_SWITCH $$42 '(' $$43 switch_type_spec $$44 ')' $$45 '{' $$46 at_least_one_case_branch $$47 '}'",
+"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 :",
 "$$48 :",
 "$$49 :",
-"member_i : type_spec $$48 at_least_one_declarator $$49 ';'",
+"case_branch : at_least_one_case_label $$48 element_spec $$49 ';'",
 "$$50 :",
-"member_i : error $$50 ';'",
+"case_branch : error $$50 ';'",
+"at_least_one_case_label : case_label case_labels",
+"case_labels : case_labels case_label",
+"case_labels :",
 "$$51 :",
+"case_label : IDL_DEFAULT $$51 ':'",
 "$$52 :",
 "$$53 :",
+"case_label : IDL_CASE $$52 const_expr $$53 ':'",
 "$$54 :",
+"element_spec : type_spec $$54 declarator",
 "$$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 :",
+"enum_type : IDL_ENUM $$55 id $$56 '{' $$57 at_least_one_enumerator $$58 '}'",
+"at_least_one_enumerator : enumerator enumerators",
 "$$59 :",
+"enumerators : enumerators ',' $$59 enumerator",
+"enumerators :",
+"enumerator : IDENTIFIER",
 "$$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 :",
+"sequence_type_spec : seq_head ',' $$60 positive_int_expr $$61 '>'",
+"sequence_type_spec : seq_head '>'",
 "$$62 :",
-"case_label : IDL_DEFAULT $$62 ':'",
 "$$63 :",
+"seq_head : IDL_SEQUENCE $$62 '<' $$63 simple_type_spec",
 "$$64 :",
-"case_label : IDL_CASE $$63 const_expr $$64 ':'",
 "$$65 :",
-"element_spec : type_spec $$65 declarator",
+"string_type_spec : string_head '<' $$64 positive_int_expr $$65 '>'",
+"string_type_spec : string_head",
+"string_head : IDL_STRING",
 "$$66 :",
 "$$67 :",
+"wstring_type_spec : wstring_head '<' $$66 positive_int_expr $$67 '>'",
+"wstring_type_spec : wstring_head",
+"wstring_head : IDL_WSTRING",
 "$$68 :",
+"array_declarator : id $$68 at_least_one_array_dim",
+"at_least_one_array_dim : array_dim array_dims",
+"array_dims : array_dims array_dim",
+"array_dims :",
 "$$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",
+"array_dim : '[' $$69 positive_int_expr $$70 ']'",
 "$$71 :",
 "$$72 :",
-"sequence_type_spec : seq_head ',' $$71 positive_int_expr $$72 '>'",
-"sequence_type_spec : seq_head '>'",
+"attribute : opt_readonly IDL_ATTRIBUTE $$71 param_type_spec $$72 at_least_one_simple_declarator",
+"opt_readonly : IDL_READONLY",
+"opt_readonly :",
 "$$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",
+"exception : IDL_EXCEPTION $$73 id $$74 '{' $$75 members $$76 '}'",
 "$$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",
+"operation : opt_op_attribute op_type_spec $$77 IDENTIFIER $$78 parameter_list $$79 opt_raises $$80 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 ')'",
+"$$81 :",
+"parameter_list : '(' $$81 ')'",
+"$$82 :",
+"parameter_list : '(' $$82 at_least_one_parameter ')'",
 "at_least_one_parameter : parameter parameters",
-"$$94 :",
-"parameters : parameters ',' $$94 parameter",
+"$$83 :",
+"parameters : parameters ',' $$83 parameter",
 "parameters :",
-"$$95 :",
-"$$96 :",
-"parameter : direction $$95 param_type_spec $$96 declarator",
+"$$84 :",
+"$$85 :",
+"parameter : direction $$84 param_type_spec $$85 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 ')'",
+"$$86 :",
+"$$87 :",
+"opt_raises : IDL_RAISES $$86 '(' $$87 at_least_one_scoped_name ')'",
 "opt_raises :",
-"$$99 :",
-"$$100 :",
-"opt_context : IDL_CONTEXT $$99 '(' $$100 at_least_one_string_literal ')'",
+"$$88 :",
+"$$89 :",
+"opt_context : IDL_CONTEXT $$88 '(' $$89 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",
+"$$90 :",
+"string_literals : string_literals ',' $$90 IDL_STRING_LITERAL",
 "string_literals :",
 };
 #endif
@@ -909,7 +790,7 @@ 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"
+#line 2294 "fe/idl.tao_yy"
 /* programs */
 
 /*
@@ -931,7 +812,7 @@ void
 tao_yyerror(const char *)
 {
 }
-#line 934 "y.tab.cpp"
+#line 815 "y.tab.cpp"
 #define TAO_YYABORT goto tao_yyabort
 #define TAO_YYACCEPT goto tao_yyaccept
 #define TAO_YYERROR goto tao_yyerrlab
@@ -1216,7 +1097,7 @@ tao_yyinrecovery:
             if (5 < tao_yydebug)
                 printf("tao_yydebug: state %d, error recovery discards token %d (%s)\n",
                     tao_yystate, tao_yychar, tao_yys);
-            else
+            else 
                 TAO_YYDEBUG_DISCARD_TOKEN(tao_yystate, tao_yychar, tao_yys, tao_yyssp-tao_yyss);
         }
 #endif
@@ -1237,2386 +1118,2189 @@ tao_yyreduce:
     switch (tao_yyn)
     {
 case 4:
-#line 253 "fe/idl.tao_yy"
+#line 240 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  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);
-        }
+	  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);
-        }
+	  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());
-        }
+	    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;
-        }
+	    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;
 case 18:
-#line 312 "fe/idl.tao_yy"
+#line 316 "fe/idl.tao_yy"
 {
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-          }
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
+	  }
 break;
 case 19:
-#line 316 "fe/idl.tao_yy"
+#line 320 "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);
-          }
+	    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();
-          }
+#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_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);
+	    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_yyvsp[0].ihval->inherits());
+		    fd->set_n_inherits(tao_yyvsp[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);
-        }
+	  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);
-        }
+#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);
-        }
+	   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();
-        }
+#line 459 "fe/idl.tao_yy"
+{
+	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
+	   tao_yyval.idval = tao_yyvsp[0].idval;
+	 }
 break;
 case 29:
-#line 419 "fe/idl.tao_yy"
+#line 467 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-         }
+	  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;
 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;
-         }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
+        }
 break;
 case 31:
-#line 431 "fe/idl.tao_yy"
+#line 485 "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);
-        }
+	  tao_yyval.nlval = tao_yyvsp[0].nlval;
+	}
 break;
 case 32:
-#line 445 "fe/idl.tao_yy"
+#line 489 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
+	  tao_yyval.nlval = NULL;
+	}
+break;
+case 35:
+#line 501 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
         }
 break;
-case 33:
-#line 449 "fe/idl.tao_yy"
+case 36:
+#line 505 "fe/idl.tao_yy"
 {
-          tao_yyval.nlval = tao_yyvsp[0].nlval;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
-case 34:
-#line 453 "fe/idl.tao_yy"
+case 37:
+#line 509 "fe/idl.tao_yy"
 {
-          tao_yyval.nlval = NULL;
+	  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"
+#line 517 "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) */
+	  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"
+#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) {
-            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);
+	  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);
+	  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);
+	  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();
+#line 537 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 45:
-#line 525 "fe/idl.tao_yy"
+#line 541 "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);
-        }
+	  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);
-        }
+	  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);
-        }
+	  tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[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();
+	  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);
-        }
+	  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 50:
-#line 588 "fe/idl.tao_yy"
+#line 576 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen);
-        }
+	  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;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+	  tao_yyval.idlist = new UTL_IdList(tao_yyvsp[0].idval, NULL);
+	}
 break;
 case 52:
-#line 600 "fe/idl.tao_yy"
+#line 589 "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; */
-          }
+	  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;
-          }
+	  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 54:
-#line 616 "fe/idl.tao_yy"
+#line 601 "fe/idl.tao_yy"
 {
-              tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
-            }
+	  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;
-            }
+	  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;
 case 56:
-#line 628 "fe/idl.tao_yy"
+#line 614 "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);
-          }
+            tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE);
         }
 break;
 case 57:
-#line 648 "fe/idl.tao_yy"
+#line 621 "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();
+	  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);
-          }
-        }
+	  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"
+#line 641 "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";
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
         }
 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;
-case 70:
-#line 709 "fe/idl.tao_yy"
+case 59:
+#line 645 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
         }
 break;
-case 71:
-#line 713 "fe/idl.tao_yy"
+case 60:
+#line 649 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
         }
 break;
-case 72:
-#line 717 "fe/idl.tao_yy"
+case 61:
+#line 653 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
         }
 break;
-case 73:
-#line 721 "fe/idl.tao_yy"
+case 62:
+#line 657 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  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;
+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 74:
-#line 725 "fe/idl.tao_yy"
+case 70:
+#line 698 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
+	  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;
-case 75:
-#line 729 "fe/idl.tao_yy"
+case 74:
+#line 744 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+	}
 break;
 case 76:
-#line 733 "fe/idl.tao_yy"
+#line 752 "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);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[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 760 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+	}
 break;
 case 80:
-#line 749 "fe/idl.tao_yy"
+#line 768 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[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"
+#line 772 "fe/idl.tao_yy"
 {
-          tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
+	}
 break;
 case 83:
-#line 769 "fe/idl.tao_yy"
+#line 780 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[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;
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
+	}
 break;
 case 86:
-#line 791 "fe/idl.tao_yy"
+#line 792 "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);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+	}
 break;
 case 87:
-#line 797 "fe/idl.tao_yy"
+#line 796 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+	}
 break;
 case 88:
-#line 801 "fe/idl.tao_yy"
+#line 800 "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);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+	}
 break;
 case 90:
-#line 813 "fe/idl.tao_yy"
+#line 808 "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;
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
+					      tao_yyvsp[0].exval,
+					      NULL);
+	}
 break;
 case 91:
-#line 822 "fe/idl.tao_yy"
+#line 814 "fe/idl.tao_yy"
 {
-            tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
+					      tao_yyvsp[0].exval,
+					      NULL);
+	}
 break;
 case 92:
-#line 829 "fe/idl.tao_yy"
+#line 820 "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);
-          }
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
+					      tao_yyvsp[0].exval,
+					      NULL);
+	}
 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 829 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
+	  /*
+	   * 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;
 case 95:
-#line 857 "fe/idl.tao_yy"
+#line 839 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        }
+	  tao_yyval.exval = tao_yyvsp[-1].exval;
+	}
 break;
 case 96:
-#line 861 "fe/idl.tao_yy"
+#line 846 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[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;
-case 103:
-#line 898 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_string;
-        }
-break;
-case 104:
-#line 902 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_wstring;
-        }
-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;
-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;
-case 113:
-#line 968 "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;
-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;
-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;
-case 130:
-#line 1047 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = tao_yyvsp[-1].exval;
-        }
-break;
-case 131:
-#line 1054 "fe/idl.tao_yy"
+#line 850 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval);
+	}
 break;
-case 132:
-#line 1058 "fe/idl.tao_yy"
+case 98:
+#line 854 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval);
+	}
 break;
-case 133:
-#line 1062 "fe/idl.tao_yy"
+case 99:
+#line 858 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval);
+	}
 break;
-case 134:
-#line 1066 "fe/idl.tao_yy"
+case 100:
+#line 862 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
+					    AST_Expression::EV_bool);
+	}
 break;
-case 135:
-#line 1070 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-                                            AST_Expression::EV_bool);
-        }
-break;
-case 136:
-#line 1075 "fe/idl.tao_yy"
+case 101:
+#line 867 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-                                            AST_Expression::EV_bool);
-        }
+	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
+					    AST_Expression::EV_bool);
+	}
 break;
-case 137:
-#line 1083 "fe/idl.tao_yy"
+case 102:
+#line 875 "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);
-        }
+	    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;
-case 138:
-#line 1091 "fe/idl.tao_yy"
+case 103:
+#line 883 "fe/idl.tao_yy"
 {
-            idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-          }
+	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
+	  }
 break;
-case 139:
-#line 1094 "fe/idl.tao_yy"
+case 104:
+#line 886 "fe/idl.tao_yy"
 {tao_yyval.ival = 0;}
 break;
-case 140:
-#line 1095 "fe/idl.tao_yy"
+case 105:
+#line 887 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 141:
-#line 1096 "fe/idl.tao_yy"
+case 106:
+#line 888 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 142:
-#line 1097 "fe/idl.tao_yy"
+case 107:
+#line 889 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 143:
-#line 1099 "fe/idl.tao_yy"
+case 108:
+#line 891 "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();
+	  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);
-          }
-        }
+	  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;
-case 144:
-#line 1124 "fe/idl.tao_yy"
+case 109:
+#line 916 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
         }
 break;
-case 145:
-#line 1128 "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();
+case 110:
+#line 920 "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;
+	  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;
-          }
-        }
+		     continue;
+	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
+	      (void) s->fe_add_typedef(t);
+	    }
+	    delete l;
+	  }
+	}
 break;
-case 148:
-#line 1167 "fe/idl.tao_yy"
+case 113:
+#line 959 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+	}
 break;
-case 150:
-#line 1172 "fe/idl.tao_yy"
+case 115:
+#line 964 "fe/idl.tao_yy"
 {
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Decl      *d = NULL;
+	  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;
-        }
+	  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"
+case 128:
+#line 999 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-        }
+	  tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
+	}
 break;
-case 164:
-#line 1215 "fe/idl.tao_yy"
+case 129:
+#line 1007 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         }
 break;
-case 165:
-#line 1219 "fe/idl.tao_yy"
+case 130:
+#line 1011 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+	  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;
-          }
-        }
+	  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;
-case 166:
-#line 1230 "fe/idl.tao_yy"
+case 131:
+#line 1022 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = NULL;
-        }
+	  tao_yyval.dlval = NULL;
+	}
 break;
-case 169:
-#line 1242 "fe/idl.tao_yy"
+case 134:
+#line 1034 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-        }
+	  tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
+	}
 break;
-case 170:
-#line 1250 "fe/idl.tao_yy"
+case 135:
+#line 1042 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         }
 break;
-case 171:
-#line 1254 "fe/idl.tao_yy"
+case 136:
+#line 1046 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+	  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;
-          }
-        }
+	  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;
-case 172:
-#line 1265 "fe/idl.tao_yy"
+case 137:
+#line 1057 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = NULL;
-        }
+	  tao_yyval.dlval = NULL;
+	}
 break;
-case 173:
-#line 1272 "fe/idl.tao_yy"
+case 138:
+#line 1064 "fe/idl.tao_yy"
 {
-          tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL),
-                                 FE_Declarator::FD_simple, NULL);
-        }
+	  tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL),
+				 FE_Declarator::FD_simple, NULL);
+	}
 break;
-case 174:
-#line 1280 "fe/idl.tao_yy"
+case 139:
+#line 1072 "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);
-        }
+	  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;
-case 177:
-#line 1294 "fe/idl.tao_yy"
+case 142:
+#line 1086 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_long;
-        }
+	  tao_yyval.etval = AST_Expression::EV_long;
+	}
 break;
-case 178:
-#line 1298 "fe/idl.tao_yy"
+case 143:
+#line 1090 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_longlong;
+	  tao_yyval.etval = AST_Expression::EV_longlong;
         }
 break;
-case 179:
-#line 1302 "fe/idl.tao_yy"
+case 144:
+#line 1094 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_short;
-        }
+	  tao_yyval.etval = AST_Expression::EV_short;
+	}
 break;
-case 180:
-#line 1309 "fe/idl.tao_yy"
+case 145:
+#line 1101 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_ulong;
-        }
+	  tao_yyval.etval = AST_Expression::EV_ulong;
+	}
 break;
-case 181:
-#line 1313 "fe/idl.tao_yy"
+case 146:
+#line 1105 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_ulonglong;
+	  tao_yyval.etval = AST_Expression::EV_ulonglong;
         }
 break;
-case 182:
-#line 1317 "fe/idl.tao_yy"
+case 147:
+#line 1109 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_ushort;
-        }
+	  tao_yyval.etval = AST_Expression::EV_ushort;
+	}
 break;
-case 183:
-#line 1324 "fe/idl.tao_yy"
+case 148:
+#line 1116 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_double;
-        }
+	  tao_yyval.etval = AST_Expression::EV_double;
+	}
 break;
-case 184:
-#line 1328 "fe/idl.tao_yy"
+case 149:
+#line 1120 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_float;
-        }
+	  tao_yyval.etval = AST_Expression::EV_float;
+	}
 break;
-case 185:
-#line 1332 "fe/idl.tao_yy"
+case 150:
+#line 1124 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_longdouble;
+	  tao_yyval.etval = AST_Expression::EV_longdouble;
         }
 break;
-case 186:
-#line 1339 "fe/idl.tao_yy"
+case 151:
+#line 1131 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_char;
-        }
+	  tao_yyval.etval = AST_Expression::EV_char;
+	}
 break;
-case 187:
-#line 1343 "fe/idl.tao_yy"
+case 152:
+#line 1135 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_wchar;
+	  tao_yyval.etval = AST_Expression::EV_wchar;
         }
 break;
-case 188:
-#line 1350 "fe/idl.tao_yy"
+case 153:
+#line 1142 "fe/idl.tao_yy"
 {
           tao_yyval.etval = AST_Expression::EV_octet;
-        }
+	}
 break;
-case 189:
-#line 1357 "fe/idl.tao_yy"
+case 154:
+#line 1149 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_bool;
+	  tao_yyval.etval = AST_Expression::EV_bool;
         }
 break;
-case 190:
-#line 1364 "fe/idl.tao_yy"
+case 155:
+#line 1156 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_any;
-        }
+	  tao_yyval.etval = AST_Expression::EV_any;
+	}
 break;
-case 191:
-#line 1371 "fe/idl.tao_yy"
+case 156:
+#line 1163 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
         }
 break;
-case 192:
-#line 1375 "fe/idl.tao_yy"
+case 157:
+#line 1167 "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;
+	  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);
-        }
+	  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 193:
-#line 1399 "fe/idl.tao_yy"
+case 158:
+#line 1191 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
         }
 break;
-case 194:
-#line 1403 "fe/idl.tao_yy"
+case 159:
+#line 1195 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
         }
 break;
-case 195:
-#line 1407 "fe/idl.tao_yy"
+case 160:
+#line 1199 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-          /*
-           * Done with this struct. Pop its scope off the scopes stack
-           */
+	  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);
+	      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 199:
-#line 1431 "fe/idl.tao_yy"
-{
-          /* is $0 to member_i */
-          tao_yyval.vival = AST_Field::vis_NA;
-        }
+	}
 break;
-case 201:
-#line 1440 "fe/idl.tao_yy"
+case 164:
+#line 1224 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
         }
 break;
-case 202:
-#line 1444 "fe/idl.tao_yy"
+case 165:
+#line 1228 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
         }
 break;
-case 203:
-#line 1448 "fe/idl.tao_yy"
+case 166:
+#line 1232 "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();
+	  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;
-case 204:
-#line 1482 "fe/idl.tao_yy"
+	  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;
+	      f = idl_global->gen()->create_field(tp, d->name(), p);
+	      (void) s->fe_add_field(f);
+	    }
+	    delete l;
+	  }
+	}
+break;
+case 167:
+#line 1265 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	}
 break;
-case 205:
-#line 1486 "fe/idl.tao_yy"
+case 168:
+#line 1269 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	}
 break;
-case 206:
-#line 1494 "fe/idl.tao_yy"
+case 169:
+#line 1277 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
         }
 break;
-case 207:
-#line 1498 "fe/idl.tao_yy"
+case 170:
+#line 1281 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
         }
 break;
-case 208:
-#line 1502 "fe/idl.tao_yy"
+case 171:
+#line 1285 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
         }
 break;
-case 209:
-#line 1506 "fe/idl.tao_yy"
+case 172:
+#line 1289 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
         }
 break;
-case 210:
-#line 1510 "fe/idl.tao_yy"
+case 173:
+#line 1293 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
         }
 break;
-case 211:
-#line 1514 "fe/idl.tao_yy"
+case 174:
+#line 1297 "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();
+	  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_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);
+	  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);
-        }
+	      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 212:
-#line 1543 "fe/idl.tao_yy"
+case 175:
+#line 1326 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
         }
 break;
-case 213:
-#line 1547 "fe/idl.tao_yy"
+case 176:
+#line 1330 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
         }
 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();
-        }
+case 177:
+#line 1334 "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 215:
-#line 1569 "fe/idl.tao_yy"
+case 178:
+#line 1352 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+	}
 break;
-case 216:
-#line 1573 "fe/idl.tao_yy"
+case 179:
+#line 1356 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+	}
 break;
-case 217:
-#line 1577 "fe/idl.tao_yy"
+case 180:
+#line 1360 "fe/idl.tao_yy"
 {
           /* octets are not allowed*/
           idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
-        }
+	}
 break;
-case 218:
-#line 1582 "fe/idl.tao_yy"
+case 181:
+#line 1365 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+	}
 break;
-case 220:
-#line 1587 "fe/idl.tao_yy"
+case 183:
+#line 1370 "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;
+	  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:
+	  /*
+	   * 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
+		    found = I_TRUE;
+		    break;
+		  default:
+		    tao_yyval.dcval = NULL;
+		    found = I_TRUE;
+		    break;
+		  }
+		} else
                 {
-                    tao_yyval.dcval = NULL;
-                    found = I_TRUE;
+		    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;
+		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);
-        }
+	  if (tao_yyval.dcval == NULL)
+	    idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
+	}
 break;
-case 224:
-#line 1666 "fe/idl.tao_yy"
+case 187:
+#line 1449 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
         }
 break;
-case 225:
-#line 1670 "fe/idl.tao_yy"
+case 188:
+#line 1453 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
         }
 break;
-case 226:
-#line 1674 "fe/idl.tao_yy"
+case 189:
+#line 1457 "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;
+	  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;
-          }
-        }
+	  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;
-case 227:
-#line 1702 "fe/idl.tao_yy"
+case 190:
+#line 1485 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	}
 break;
-case 228:
-#line 1707 "fe/idl.tao_yy"
+case 191:
+#line 1490 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	}
 break;
-case 229:
-#line 1715 "fe/idl.tao_yy"
+case 192:
+#line 1498 "fe/idl.tao_yy"
 {
-          tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval);
-        }
+	  tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval);
+	}
 break;
-case 230:
-#line 1722 "fe/idl.tao_yy"
+case 193:
+#line 1505 "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;
-          }
-        }
+	  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;
-case 231:
-#line 1731 "fe/idl.tao_yy"
+case 194:
+#line 1514 "fe/idl.tao_yy"
 {
-          tao_yyval.llval = NULL;
-        }
+	  tao_yyval.llval = NULL;
+	}
 break;
-case 232:
-#line 1738 "fe/idl.tao_yy"
+case 195:
+#line 1521 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
         }
 break;
-case 233:
-#line 1742 "fe/idl.tao_yy"
+case 196:
+#line 1525 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
 
-          tao_yyval.ulval = idl_global->gen()->
-                    create_union_label(AST_UnionLabel::UL_default,
-                                       NULL);
-        }
+	  tao_yyval.ulval = idl_global->gen()->
+	            create_union_label(AST_UnionLabel::UL_default,
+				       NULL);
+	}
 break;
-case 234:
-#line 1750 "fe/idl.tao_yy"
+case 197:
+#line 1533 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
         }
 break;
-case 235:
-#line 1754 "fe/idl.tao_yy"
+case 198:
+#line 1537 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
         }
 break;
-case 236:
-#line 1758 "fe/idl.tao_yy"
+case 199:
+#line 1541 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+	  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);
-        }
+	  tao_yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
+						     tao_yyvsp[-2].exval);
+	}
 break;
-case 237:
-#line 1768 "fe/idl.tao_yy"
+case 200:
+#line 1551 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
         }
 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());
-          }
-        }
+case 201:
+#line 1555 "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;
-case 239:
-#line 1798 "fe/idl.tao_yy"
+case 202:
+#line 1581 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
         }
 break;
-case 240:
-#line 1802 "fe/idl.tao_yy"
+case 203:
+#line 1585 "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();
+	  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);
-        }
+	  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 241:
-#line 1829 "fe/idl.tao_yy"
+case 204:
+#line 1612 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
         }
 break;
-case 242:
-#line 1833 "fe/idl.tao_yy"
+case 205:
+#line 1616 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
         }
 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();
-          }
-        }
+case 206:
+#line 1620 "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"
+case 208:
+#line 1639 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
         }
 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();
+case 211:
+#line 1648 "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);
-          }
-        }
+	  /*
+	   * 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 249:
-#line 1889 "fe/idl.tao_yy"
+case 212:
+#line 1672 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
         }
 break;
-case 250:
-#line 1893 "fe/idl.tao_yy"
+case 213:
+#line 1676 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
         }
 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));
-            }
-          }
-        }
+case 214:
+#line 1680 "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;
-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;
+case 215:
+#line 1711 "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));
-            }
-          }
-        }
+	      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 253:
-#line 1961 "fe/idl.tao_yy"
+case 216:
+#line 1744 "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);
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
+	  /*
+	   * Push a sequence marker on scopes stack
+	   */
+	  idl_global->scopes()->push(NULL);
+	}
 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"
+case 217:
+#line 1752 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-          tao_yyval.dcval = tao_yyvsp[0].dcval;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
         }
 break;
-case 256:
-#line 1982 "fe/idl.tao_yy"
+case 218:
+#line 1756 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
+	  tao_yyval.dcval = tao_yyvsp[0].dcval;
         }
 break;
-case 257:
-#line 1986 "fe/idl.tao_yy"
+case 219:
+#line 1765 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
         }
 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));
-          }
-        }
+case 220:
+#line 1769 "fe/idl.tao_yy"
+{
+	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+        }
+break;
+case 221:
+#line 1773 "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;
+case 222:
+#line 1791 "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 259:
-#line 2008 "fe/idl.tao_yy"
+case 223:
+#line 1809 "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));
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         }
 break;
-case 260:
-#line 2026 "fe/idl.tao_yy"
+case 224:
+#line 1817 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
         }
 break;
-case 261:
-#line 2034 "fe/idl.tao_yy"
+case 225:
+#line 1821 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
         }
 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()
+case 226:
+#line 1825 "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 227:
+#line 1843 "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 265:
-#line 2078 "fe/idl.tao_yy"
+case 228:
+#line 1861 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         }
 break;
-case 266:
-#line 2085 "fe/idl.tao_yy"
+case 229:
+#line 1868 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
         }
 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);
-          }
-        }
+case 230:
+#line 1872 "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;
-case 268:
-#line 2103 "fe/idl.tao_yy"
+case 231:
+#line 1886 "fe/idl.tao_yy"
 {
-          tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval);
-        }
+	  tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval);
+	}
 break;
-case 269:
-#line 2110 "fe/idl.tao_yy"
+case 232:
+#line 1893 "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;
-          }
-        }
+	  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;
-case 270:
-#line 2119 "fe/idl.tao_yy"
+case 233:
+#line 1902 "fe/idl.tao_yy"
 {
-          tao_yyval.elval = NULL;
-        }
+	  tao_yyval.elval = NULL;
+	}
 break;
-case 271:
-#line 2126 "fe/idl.tao_yy"
+case 234:
+#line 1909 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
         }
 break;
-case 272:
-#line 2130 "fe/idl.tao_yy"
+case 235:
+#line 1913 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
         }
 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;
-        }
+case 236:
+#line 1917 "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;
-case 274:
-#line 2151 "fe/idl.tao_yy"
+case 237:
+#line 1934 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
         }
 break;
-case 275:
-#line 2155 "fe/idl.tao_yy"
+case 238:
+#line 1938 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
         }
 break;
-case 276:
-#line 2159 "fe/idl.tao_yy"
+case 239:
+#line 1942 "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();
+	  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;
-          }
-        }
+	  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;
-case 277:
-#line 2193 "fe/idl.tao_yy"
+case 240:
+#line 1976 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-          tao_yyval.bval = I_TRUE;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
+	  tao_yyval.bval = I_TRUE;
+	}
 break;
-case 278:
-#line 2198 "fe/idl.tao_yy"
+case 241:
+#line 1981 "fe/idl.tao_yy"
 {
-          tao_yyval.bval = I_FALSE;
-        }
+	  tao_yyval.bval = I_FALSE;
+	}
 break;
-case 279:
-#line 2205 "fe/idl.tao_yy"
+case 242:
+#line 1988 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
+	}
 break;
-case 280:
-#line 2209 "fe/idl.tao_yy"
+case 243:
+#line 1992 "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;
+	  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);
+	  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 2016 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
         }
 break;
-case 281:
-#line 2233 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        }
-break;
-case 282:
-#line 2237 "fe/idl.tao_yy"
+case 245:
+#line 2020 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
         }
 break;
-case 283:
-#line 2241 "fe/idl.tao_yy"
+case 246:
+#line 2024 "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();
-        }
+	  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 284:
-#line 2253 "fe/idl.tao_yy"
+case 247:
+#line 2036 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
         }
 break;
-case 285:
-#line 2257 "fe/idl.tao_yy"
+case 248:
+#line 2040 "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();
+	  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);
+	  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);
-        }
+	      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"
+case 249:
+#line 2069 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
         }
 break;
-case 287:
-#line 2290 "fe/idl.tao_yy"
+case 250:
+#line 2073 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
         }
 break;
-case 288:
-#line 2294 "fe/idl.tao_yy"
+case 251:
+#line 2077 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Operation         *o = NULL;
+	  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);
+	  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();
-        }
+	    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"
+case 252:
+#line 2102 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-          tao_yyval.ofval = AST_Operation::OP_idempotent;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+	  tao_yyval.ofval = AST_Operation::OP_oneway;
+	}
 break;
-case 291:
-#line 2329 "fe/idl.tao_yy"
+case 253:
+#line 2107 "fe/idl.tao_yy"
 {
-          tao_yyval.ofval = AST_Operation::OP_noflags;
-        }
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+	  tao_yyval.ofval = AST_Operation::OP_idempotent;
+	}
 break;
-case 293:
-#line 2337 "fe/idl.tao_yy"
+case 254:
+#line 2112 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval =
-            idl_global->scopes()->bottom()
-               ->lookup_primitive_type(AST_Expression::EV_void);
-        }
+	  tao_yyval.ofval = AST_Operation::OP_noflags;
+	}
 break;
-case 294:
-#line 2346 "fe/idl.tao_yy"
+case 256:
+#line 2120 "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";
-        }
+	  tao_yyval.dcval =
+	    idl_global->scopes()->bottom()
+	       ->lookup_primitive_type(AST_Expression::EV_void);
+	}
 break;
-case 295:
-#line 2356 "fe/idl.tao_yy"
+case 257:
+#line 2129 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         }
 break;
-case 296:
-#line 2360 "fe/idl.tao_yy"
+case 258:
+#line 2133 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         }
 break;
-case 297:
-#line 2364 "fe/idl.tao_yy"
+case 259:
+#line 2137 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         }
 break;
-case 298:
-#line 2369 "fe/idl.tao_yy"
+case 260:
+#line 2142 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         }
 break;
-case 300:
-#line 2379 "fe/idl.tao_yy"
+case 262:
+#line 2152 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
         }
 break;
-case 303:
-#line 2388 "fe/idl.tao_yy"
+case 265:
+#line 2161 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
         }
 break;
-case 304:
-#line 2392 "fe/idl.tao_yy"
+case 266:
+#line 2165 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
         }
 break;
-case 305:
-#line 2396 "fe/idl.tao_yy"
+case 267:
+#line 2169 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Argument          *a = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
+	  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);
-            }
-          }
-        }
+	  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"
+case 268:
+#line 2191 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+	}
 break;
-case 308:
-#line 2423 "fe/idl.tao_yy"
+case 270:
+#line 2196 "fe/idl.tao_yy"
 {
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Decl      *d = NULL;
+	  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;
-        }
+	  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"
+case 271:
+#line 2210 "fe/idl.tao_yy"
 {
-          tao_yyval.dival = AST_Argument::dir_IN;
-        }
+	  tao_yyval.dival = AST_Argument::dir_IN;
+	}
 break;
-case 310:
-#line 2441 "fe/idl.tao_yy"
+case 272:
+#line 2214 "fe/idl.tao_yy"
 {
-          tao_yyval.dival = AST_Argument::dir_OUT;
-        }
+	  tao_yyval.dival = AST_Argument::dir_OUT;
+	}
 break;
-case 311:
-#line 2445 "fe/idl.tao_yy"
+case 273:
+#line 2218 "fe/idl.tao_yy"
 {
-          tao_yyval.dival = AST_Argument::dir_INOUT;
-        }
+	  tao_yyval.dival = AST_Argument::dir_INOUT;
+	}
 break;
-case 312:
-#line 2452 "fe/idl.tao_yy"
+case 274:
+#line 2225 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
         }
 break;
-case 313:
-#line 2456 "fe/idl.tao_yy"
+case 275:
+#line 2229 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
         }
 break;
-case 314:
-#line 2461 "fe/idl.tao_yy"
+case 276:
+#line 2234 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-          tao_yyval.nlval = tao_yyvsp[-1].nlval;
-        }
+	  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"
+case 277:
+#line 2239 "fe/idl.tao_yy"
 {
-          tao_yyval.nlval = NULL;
-        }
+	  tao_yyval.nlval = NULL;
+	}
 break;
-case 316:
-#line 2473 "fe/idl.tao_yy"
+case 278:
+#line 2246 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
         }
 break;
-case 317:
-#line 2477 "fe/idl.tao_yy"
+case 279:
+#line 2250 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
         }
 break;
-case 318:
-#line 2482 "fe/idl.tao_yy"
+case 280:
+#line 2255 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-          tao_yyval.slval = tao_yyvsp[-1].slval;
-        }
+	  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"
+case 281:
+#line 2260 "fe/idl.tao_yy"
 {
-          tao_yyval.slval = NULL;
-        }
+	  tao_yyval.slval = NULL;
+	}
 break;
-case 320:
-#line 2494 "fe/idl.tao_yy"
+case 282:
+#line 2267 "fe/idl.tao_yy"
 {
-          tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval);
-        }
+	  tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval);
+	}
 break;
-case 321:
-#line 2502 "fe/idl.tao_yy"
+case 283:
+#line 2275 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
         }
 break;
-case 322:
-#line 2506 "fe/idl.tao_yy"
+case 284:
+#line 2279 "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;
-          }
-        }
+	  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"
+case 285:
+#line 2288 "fe/idl.tao_yy"
 {
-          tao_yyval.slval = NULL;
-        }
+	  tao_yyval.slval = NULL;
+	}
 break;
-#line 3619 "y.tab.cpp"
+#line 3303 "y.tab.cpp"
     }
     tao_yyssp -= tao_yym;
     tao_yystate = *tao_yyssp;
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 9072bf04bde..f68f2acb310 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -35,49 +35,39 @@
 #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 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
 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           */
+  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      */
+  String		*sval;		/* String value		*/
+  char			*strval;	/* char * value		*/
+  Identifier		*idval;		/* Identifier		*/
+  UTL_IdList		*idlist;	/* Identifier list	*/
 } TAO_YYSTYPE;
 extern TAO_YYSTYPE tao_yylval;
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 21a7064fb09..68aa523697d 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -136,10 +136,8 @@ public:
       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) */
+      ACE_CDR::LongLong   llval;    // Contains long long expr value
+      ACE_CDR::ULongLong  ullval;   // Contains unsigned long long expr value
       float               fval;     // Contains 32-bit float expr value
       double              dval;     // Contains 64-bit float expr value
       char                cval;     // Contains char expression value
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..ebc1657a4c9 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.
 
@@ -491,10 +488,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 +499,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 +579,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 +605,7 @@ private:
 
  // Implementation's skeleton file name ending. Default is "I.cpp".
   char* implementation_skel_ending_;
-
+  
   //Implementaion class prefix
   char* impl_class_prefix_;
 
@@ -651,23 +637,17 @@ private:
   // 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/.
-
+  
   idl_bool any_support_;
   // do we support Any operators?
 
   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 +668,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/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..6ec0b4bd562 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -75,10 +75,10 @@ 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$")
@@ -113,7 +113,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 +126,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 +147,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 +176,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 +188,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 +226,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 +257,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..bce36922eae 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -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..bd04ea818d0 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 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 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/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..5404f1490a9 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -126,12 +126,6 @@ IDL_GlobalData::IDL_GlobalData (void)
       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),
@@ -1264,32 +1258,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/VERSION b/TAO/VERSION
index a63ca4fa3e5..bab89027084 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 0.3.23, released Sat May 22 17:10:11 1999.
+This is TAO version 0.3.19, released Mon Apr 12 00:26:31 1999.
 
 If you have any problems with or questions about TAO, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/TAO/configure.in b/TAO/configure.in
index f0e3b36c626..981d94f30d1 100644
--- a/TAO/configure.in
+++ b/TAO/configure.in
@@ -57,7 +57,7 @@ changequote(, )dnl
 TAO_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
 changequote([, ])dnl
 
-AM_INIT_AUTOMAKE("$TAO_PACKAGE", "$TAO_VERSION", )
+AM_INIT_AUTOMAKE("$TAO_PACKAGE", "$TAO_VERSION-aceconf-0.5", )
 
 dnl Generate a header file with all settings.
 dnl AM_CONFIG_HEADER(tao/config.h)
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..f8b5f68aec5 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -39,7 +39,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 +68,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 +86,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>
@@ -121,27 +127,24 @@ componentry.</TD></TR>
 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>
@@ -201,6 +204,20 @@ copied instead of appended to the CDR stream.</TD></TR>
 </P>
 </blockquote>
 
+<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>
+
 <H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
 
 <blockquote>
@@ -214,45 +231,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
@@ -268,7 +255,7 @@ copied instead of appended to the CDR stream.</TD></TR>
 	      Though <CODE>tss</CODE> should give the
 	      optimal performance;
 	      we made the default <CODE>global</CODE>.
-	      TAO optimizations for octet sequences will not work when
+	      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
@@ -420,35 +407,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/configurations.html b/TAO/docs/configurations.html
index 906c67cfb92..0a56775e882 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -1,18 +1,17 @@
-<!-- $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>
+Configuring TAO's Components</h3></center>
 
 <h3> Overview</h3>
 
@@ -30,7 +29,7 @@ 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>
+Please see <b><a href="#programming">Programming Considerations</a>
 for more detailed discussion on this.</p>
 
 <hr>
@@ -91,9 +90,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>
@@ -152,8 +151,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 +162,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 +171,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 +190,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 +249,58 @@ 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>
 
+<br>&nbsp;
+<p>&nbsp;</ol>
 Please see the <code><a href="../orbsvcs/orbsvcs/Makefile">ORBSVCS
 Makefile</a></code> for the default setting of <code>TAO_ORBSVCS</code>.<p>
 
-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>
-
+Please note the current limitations:
+<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.<p>
+  <li>We currently don't check this macro in each of the orbsvcs
+    Makefiles, or in their tests.  We might add those checks soon.<p>
+</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 +343,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 +393,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 +442,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 +487,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 +529,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>
@@ -534,10 +570,9 @@ Multiple threads, ORB-per-thread, thread-pool model.<a NAME="multiorb-tpool"></a
 <h3>
 Programming Considerations<a NAME="programming"></a></h3>
 
-  There are several ways to pass option flags into TAO's
-  components. <P>
-
 <ul>
+  There are several different ways to pass option flags into TAO's
+  components.
 
   <li><p>The plain vanilla approach is do nothing.  All TAO components
       use their default settings as described in <a
@@ -562,7 +597,7 @@ Programming Considerations<a NAME="programming"></a></h3>
       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>
+      option to tune up the program</p>.
 
   <li><p>TAO programs evaluate the configuration settings in the following
       order,</p>
@@ -623,8 +658,7 @@ Programming Considerations<a NAME="programming"></a></h3>
 <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,9 +673,7 @@ 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
 and the processing time.
@@ -652,15 +684,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 +708,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 +750,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..088c640134b 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -29,9 +29,9 @@
       <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>
+      <dt><a HREF="minimumTAO.html">minimumTAO</a> </dt><P>
     </dl>
     </td></font>
   </tr>
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..38dfb53d40c 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -48,14 +48,15 @@
       <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> 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
         </P>
       </LI>
 
@@ -102,9 +103,6 @@
       <LI><P>Add support for timeouts and protocol attributes to the
 	  ORB.
           <BR>[ASSIGNED TO:] Carlos
-	  <BR>[STATUS] Support for the Policy objects is present, but
-	  we haven't implemented any of the Policy objects and, of
-	  course, we don't use them.
 	</P>
       </LI>
 
@@ -255,57 +253,6 @@
 
     <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,
@@ -313,6 +260,12 @@
         </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.
+        </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;
@@ -324,14 +277,9 @@
         </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
+	  &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
@@ -647,6 +595,15 @@ class POA_Foo {
 	services that we want.
       <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.
+	</P>
+      </LI>
+
       <LI><B>EC:</B> Cleanup the IDL structures for subscriptions,
 	publications, etc. (in the EC).
 	<BR>[STATUS] Part of this was completed. The Header and
@@ -889,18 +846,6 @@ class POA_Foo {
 	</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 -->
@@ -1111,39 +1056,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
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..ef0f7e8cbf9 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -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 and Interoperable Naming Service</a></li>
 
 <li>
 <a href="#tservices">CORBA Trading Service</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>
@@ -446,11 +435,20 @@ requests to servants. <P>
 TAO 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>
+<li>The synchronization in the POA is not optimal. 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><P>
+
+<li>We need to 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><P>
 
 </UL>
 
@@ -470,25 +468,8 @@ Recently completed work:<P>
 
 <ul>
 
-<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> Support for collocation should be much better now because the POA
+can tell if we created the object reference.</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
@@ -560,9 +541,6 @@ removed. </li> <P>
 <li> New examples have been added to show how servants can be
 dynamically loaded from DLLs on demand. </li> <P>
 
-<li> Support for collocation should be much better now because the POA
-can tell if we created the object reference.</li><P>
-
 </UL>
 <hr>
 <h3>
@@ -580,12 +558,7 @@ object and make invocations on it using the DII.
 <p>Recent Work: TDB
 <p>Future Work: TDB
 <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
@@ -617,7 +590,7 @@ Added support for Persistence (using memory-mapped files).  Persistence
 feature is optional, and is controlled by the command line argument.</li>
 
 <li>
-Updated the implementation of the Naming Service to use new ACE
+Updated he implementation of the Naming Service to use new ACE
 exception macros.</li>
 <li>
 Added support for the InterOperable Naming Service, which enables the
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 952dd72c619..fa2c6b74cb7 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,12 +105,8 @@ 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.
@@ -187,71 +178,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -262,10 +223,36 @@ realclean: clean
  $(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 \
@@ -274,11 +261,8 @@ 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 \
@@ -297,7 +281,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -362,24 +345,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -390,13 +369,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -467,71 +439,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -542,10 +484,36 @@ realclean: clean
  $(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 \
@@ -554,11 +522,8 @@ 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 \
@@ -577,7 +542,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -642,24 +606,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -670,13 +630,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -747,71 +700,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -822,10 +745,36 @@ realclean: clean
  $(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 \
@@ -834,11 +783,8 @@ 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 \
@@ -857,7 +803,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -922,24 +867,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -950,13 +891,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1026,71 +960,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1101,10 +1005,36 @@ realclean: clean
  $(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 \
@@ -1113,11 +1043,8 @@ 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 \
@@ -1136,7 +1063,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1201,24 +1127,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1229,13 +1151,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1304,71 +1219,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1379,10 +1264,36 @@ realclean: clean
  $(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 \
@@ -1391,11 +1302,8 @@ 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 \
@@ -1414,7 +1322,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1479,24 +1386,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1507,13 +1410,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1529,6 +1425,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1604,71 +1501,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1679,10 +1546,36 @@ realclean: clean
  $(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 \
@@ -1691,11 +1584,8 @@ 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 \
@@ -1714,7 +1604,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1779,24 +1668,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1807,13 +1692,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1822,6 +1700,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1905,71 +1784,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1980,10 +1829,36 @@ realclean: clean
  $(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 \
@@ -1992,11 +1867,8 @@ 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 \
@@ -2015,7 +1887,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2080,24 +1951,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2108,13 +1975,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1983,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -2210,62 +2071,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2276,10 +2116,27 @@ realclean: clean
  $(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 \
@@ -2288,11 +2145,8 @@ 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 \
@@ -2311,7 +2165,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2376,24 +2229,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2404,13 +2253,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2419,6 +2261,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -2496,71 +2339,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2571,10 +2384,36 @@ realclean: clean
  $(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 \
@@ -2583,11 +2422,8 @@ 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 \
@@ -2606,7 +2442,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2671,24 +2506,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2699,13 +2530,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2724,6 +2548,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.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 \
@@ -2794,71 +2619,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2869,10 +2664,36 @@ realclean: clean
  $(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 \
@@ -2881,11 +2702,8 @@ 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 \
@@ -2904,7 +2722,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2969,24 +2786,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2997,13 +2810,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3022,6 +2828,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
@@ -3093,71 +2900,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3168,10 +2945,36 @@ realclean: clean
  $(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 \
@@ -3180,11 +2983,8 @@ 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 \
@@ -3203,7 +3003,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3268,24 +3067,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3296,13 +3091,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3374,71 +3162,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3449,10 +3207,36 @@ realclean: clean
  $(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 \
@@ -3461,11 +3245,8 @@ 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 \
@@ -3484,7 +3265,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3549,24 +3329,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3577,13 +3353,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -3665,62 +3434,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3731,10 +3479,27 @@ realclean: clean
  $(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 \
@@ -3743,11 +3508,8 @@ 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 \
@@ -3766,7 +3528,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3831,24 +3592,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3859,13 +3616,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3881,6 +3631,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -3966,62 +3717,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4032,10 +3762,27 @@ realclean: clean
  $(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 \
@@ -4044,11 +3791,8 @@ 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 \
@@ -4067,7 +3811,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4132,24 +3875,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4160,13 +3899,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4182,6 +3914,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -4257,71 +3990,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4332,10 +4035,36 @@ realclean: clean
  $(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 \
@@ -4344,11 +4073,8 @@ 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 \
@@ -4367,7 +4093,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4432,24 +4157,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4460,13 +4181,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4482,6 +4196,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 65aa956d458..eef2f8bf0c2 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -78,7 +78,7 @@ Notifier_i::register_callback (const char *stock_name,
       // the unbounded set entry is created.
       // 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_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
       ACE_CHECK;
 
       // When a new entry is tried to be inserted into the unbounded set and it
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/Makefile b/TAO/examples/Event_Comm/Makefile
index ec9af048e1f..95d7842ab25 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,7 +78,7 @@ 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
@@ -101,14 +96,10 @@ 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.
 
@@ -119,6 +110,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -163,11 +159,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -179,7 +170,6 @@ 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 \
@@ -212,38 +202,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -254,9 +242,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -266,11 +254,8 @@ 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 \
@@ -289,7 +274,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -354,24 +338,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -381,16 +361,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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 \
@@ -398,6 +370,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -442,11 +419,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -458,7 +430,6 @@ 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 \
@@ -491,38 +462,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -533,9 +502,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -545,11 +514,8 @@ 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 \
@@ -568,7 +534,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -633,24 +598,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -660,24 +621,21 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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 \
+ 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/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 \
@@ -721,11 +679,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -758,7 +711,6 @@ 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 \
@@ -775,38 +727,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -817,9 +767,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -829,11 +779,8 @@ 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 \
@@ -849,7 +796,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -914,24 +860,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -941,16 +883,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -977,6 +911,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1022,11 +961,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1041,9 +975,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  Consumer_Handler.h Event_Comm_i.h \
  $(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 \
+ $(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 \
@@ -1055,7 +988,6 @@ 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 \
@@ -1072,38 +1004,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1114,9 +1044,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1126,11 +1056,8 @@ 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 \
@@ -1146,7 +1073,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1211,24 +1137,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1238,16 +1160,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -1270,6 +1184,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1313,11 +1232,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1350,7 +1264,6 @@ 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 \
@@ -1367,38 +1280,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1409,9 +1320,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1421,11 +1332,8 @@ 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 \
@@ -1441,7 +1349,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1506,24 +1413,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1533,16 +1436,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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 \
@@ -1554,6 +1449,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1599,11 +1499,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1616,13 +1511,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- Event_Comm_i.h \
+ $(ACE_ROOT)/ace/Pipe.i Event_Comm_i.h \
  $(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 \
+ $(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 \
@@ -1634,7 +1527,6 @@ 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 \
@@ -1651,38 +1543,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1693,9 +1583,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1705,11 +1595,8 @@ 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 \
@@ -1725,7 +1612,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1790,24 +1676,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1817,16 +1699,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -1849,6 +1723,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1892,11 +1771,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1929,7 +1803,6 @@ 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 \
@@ -1946,38 +1819,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1988,9 +1859,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2000,11 +1871,8 @@ 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 \
@@ -2020,7 +1888,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2085,24 +1952,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2112,16 +1975,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -2148,6 +2004,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2191,11 +2052,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2228,7 +2084,6 @@ 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 \
@@ -2245,38 +2100,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2287,9 +2140,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2299,11 +2152,8 @@ 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 \
@@ -2319,7 +2169,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2384,24 +2233,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2411,16 +2256,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -2444,6 +2281,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2487,11 +2329,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2524,7 +2361,6 @@ 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 \
@@ -2541,38 +2377,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2583,9 +2417,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2595,11 +2429,8 @@ 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 \
@@ -2615,7 +2446,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2680,24 +2510,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2707,16 +2533,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -2745,6 +2563,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2790,11 +2613,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2807,13 +2625,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- Event_Comm_i.h \
+ $(ACE_ROOT)/ace/Pipe.i Event_Comm_i.h \
  $(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 \
+ $(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 \
@@ -2825,7 +2641,6 @@ 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 \
@@ -2842,38 +2657,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2884,9 +2697,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2896,11 +2709,8 @@ 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 \
@@ -2916,7 +2726,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2981,24 +2790,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3008,16 +2813,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -3035,13 +2832,17 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
  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 \
+ 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/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 \
@@ -3085,11 +2886,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3122,7 +2918,6 @@ 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 \
@@ -3139,38 +2934,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3181,9 +2974,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3193,11 +2986,8 @@ 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 \
@@ -3213,7 +3003,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3278,24 +3067,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3305,16 +3090,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index d195ad5816c..0e0490bf482 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -14,8 +14,7 @@ DIRS  = Callback_Quoter \
         POA \
 	Quoter \
 	Simple \
-	Event_Comm \
-	OBV
+	Event_Comm
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
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/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index bc7c79ff034..a8290a286a3 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -40,11 +40,11 @@ endif
 # 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/streams.h \
+ $(ACE_ROOT)/ace/inc_user_config.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 \
@@ -58,6 +58,8 @@ endif
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
+ $(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 \
@@ -110,71 +112,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -185,10 +157,36 @@ endif
  $(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,11 +195,8 @@ 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 \
@@ -220,7 +215,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -285,24 +279,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -313,13 +303,6 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index ad17a70c16d..70f9c45c46c 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/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/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..40f31c76262 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -9,26 +9,11 @@ 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)
@@ -39,78 +24,96 @@ void
 DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
                              CORBA::Environment &ACE_TRY_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;
-
-  // 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 ();
+  // Get the POA Current object reference
+  CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent");
 
-  if (ACE_OS::strcmp (operation, "_is_a") == 0)
+  ACE_TRY
     {
-      this->is_a (request, ACE_TRY_ENV);
-      ACE_CHECK;
+      // Narrow the object reference to a POA Current reference
+      PortableServer::Current_var poa_current =
+        PortableServer::Current::_narrow (obj.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // The servant determines the key associated with thex database entry
+      // represented by self
+      PortableServer::ObjectId_var oid =
+        poa_current->get_object_id (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // 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);
+
+      else
+        {
+          ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO));
+        }
+      ACE_TRY_CHECK;
     }
-  else
+  ACE_CATCHANY
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      return;
     }
+  ACE_ENDTRY;
+  ACE_CHECK;
 }
 
 void
 DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
-                           CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::NVList_ptr list;
   this->orb_->create_list (0, list);
 
-  CORBA::Any any_1 (CORBA::_tc_string);
-
-  list->add_value ("value",
-                   any_1,
-                   CORBA::ARG_IN,
-                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  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;
-
-  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))
-    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_TRY
+    {
+      CORBA::Any any_1 (CORBA::_tc_string);
+
+      list->add_value ("value",
+                       any_1,
+                       CORBA::ARG_IN,
+                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      request->arguments (list,
+                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      char *value;
+      CORBA::Any_ptr ap = list->item (0, ACE_TRY_ENV)->value ();
+      *ap >>= value;
+
+      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, CORBA::_tc_Object->id (ACE_TRY_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_CATCHANY
+    {
+      return;
+    }
+  ACE_ENDTRY;
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/,
-                                         PortableServer::POA_ptr,
+                                         PortableServer::POA_ptr ,
                                          CORBA::Environment &)
 {
   return 0;
@@ -123,18 +126,14 @@ DatabaseImpl::Entry::_default_POA (CORBA::Environment &)
 }
 
 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;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-  this->poa_->set_servant (&this->common_servant_,
-                           ACE_TRY_ENV);
+  this->poa_->set_servant (&this->common_servant_, ACE_TRY_ENV);
   ACE_CHECK;
 }
 
@@ -174,22 +173,15 @@ DatabaseImpl::Agent::create_entry (const char *key,
   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 ());
@@ -212,13 +204,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
   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 ()));
+      //      Employee *employee = (Employee *) temp;
 
       // creates a reference to the CORBA object used to encapsulate
       // access to the new entry in the database.  There is an interface
@@ -236,14 +222,9 @@ DatabaseImpl::Agent::find_entry (const char *key,
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee with key = %s not found\n",
-                  key));
-
       ACE_THROW_RETURN (Database::Unknown_Key (),
                         Database::Entry::_nil ());
     }
-
   return entry._retn ();
 }
 
@@ -261,32 +242,14 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
   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 ());
     }
 }
 
-void
-DatabaseImpl::Agent::shutdown (CORBA::Environment &)
-{
-  this->orb_->shutdown ();
-}
-
 PortableServer::POA_ptr
 DatabaseImpl::Agent::_default_POA (CORBA::Environment &)
 {
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index b48464d3b7f..1848038490a 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -18,7 +18,6 @@ public:
   {
   public:
     Simpler_Malloc (void);
-    ~Simpler_Malloc (void);
   };
 
   typedef ACE_Singleton<Simpler_Malloc, ACE_Null_Mutex> DATABASE;
@@ -29,8 +28,7 @@ public:
   {
   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,
@@ -50,7 +48,7 @@ public:
     // Returns the default POA for this servant.
 
     virtual void is_a (CORBA::ServerRequest_ptr request,
-                        CORBA::Environment &env);
+                       CORBA::Environment &env);
     // Handles the _is_a call
 
   protected:
@@ -59,17 +57,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 +79,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..c7d5bfb527a 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -50,7 +50,7 @@ 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.
@@ -122,7 +122,6 @@ 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 \
@@ -155,38 +154,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -209,8 +206,6 @@ 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 \
@@ -299,25 +294,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -325,13 +319,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -401,7 +388,6 @@ 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 \
@@ -434,38 +420,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -488,8 +472,6 @@ 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 \
@@ -578,25 +560,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -604,13 +585,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -679,7 +653,6 @@ 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 \
@@ -712,38 +685,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -766,8 +737,6 @@ 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 \
@@ -856,25 +825,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -882,13 +850,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -964,7 +925,6 @@ 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 \
@@ -997,38 +957,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1051,8 +1009,6 @@ 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 \
@@ -1141,25 +1097,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1167,13 +1122,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1242,7 +1190,6 @@ 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 \
@@ -1275,38 +1222,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1329,8 +1274,6 @@ 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 \
@@ -1419,25 +1362,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1445,13 +1387,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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..abbaa63e058 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);
@@ -107,48 +101,48 @@ main (int argc, char **argv)
                       "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,
+      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 (),
+      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];
-
+      
+      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;
-
+      
       ACE_OS::strcpy (str,"Database::Agent::create_entry");
-
+      
       // Create an employee
       Database::Entry_var entry = database_agent->create_entry ("irfan",
                                                                 "Employee",
@@ -156,48 +150,34 @@ main (int argc, char **argv)
                                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "Database::Employee::_narrow");
-
-      Database::Employee_var employee = Database::Employee::_narrow (entry.in (),
+      ACE_OS::strcpy (str,"Database::Employee::_narrow");
+      
+      Database::Employee_var employee = Database::Employee::_narrow (entry.in (), 
                                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       /*
-       *
-       *  NOT IMPLEMENTED YET
-       *
+       * 
+       *  NOT IMPLEMENTED YET 
+       * 
        *
        */
-
+      
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666, ACE_TRY_ENV);
+      employee->id (666, ACE_TRY_ENV);  
       ACE_TRY_CHECK;
 #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
     {
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..e0b4986ae2e 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -84,34 +84,34 @@ int
 main (int argc, char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-
+  
   char str[256];
   ACE_TRY
     {
-      ACE_OS::strcpy (str,"CORBA::ORB_init");
+      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");
+      
+      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 (),
+      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 =
+      PortableServer::POAManager_var poa_manager = 
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       CORBA::PolicyList policies (5);
       policies.length (5);
 
@@ -121,32 +121,32 @@ main (int argc, char **argv)
         root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
+      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy"); 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, 
                                           ACE_TRY_ENV);
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_request_processing_policy");
+  
+      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,
+        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_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 (),
@@ -163,27 +163,25 @@ main (int argc, char **argv)
           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;
+                                               first_poa.in ());
 
       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
@@ -193,21 +191,21 @@ main (int argc, char **argv)
 
       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,
@@ -222,6 +220,6 @@ main (int argc, char **argv)
     }
   ACE_ENDTRY;
  ACE_CHECK_RETURN (-1);
-
+      
  return 0;
 }
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index e4ad51bcb80..8799c0eb28e 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -50,7 +50,7 @@ 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.
@@ -122,71 +122,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -197,10 +167,36 @@ realclean: clean
  $(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 \
@@ -209,11 +205,8 @@ 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 \
@@ -232,7 +225,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -297,24 +289,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -325,13 +313,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -400,71 +381,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -475,10 +426,36 @@ realclean: clean
  $(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 \
@@ -487,11 +464,8 @@ 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 \
@@ -510,7 +484,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -575,24 +548,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -603,13 +572,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -681,71 +643,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -756,10 +688,36 @@ realclean: clean
  $(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 \
@@ -768,11 +726,8 @@ 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 \
@@ -791,7 +746,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -856,24 +810,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -884,13 +834,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -964,71 +907,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1039,10 +952,36 @@ realclean: clean
  $(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 \
@@ -1051,11 +990,8 @@ 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 \
@@ -1074,7 +1010,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1139,24 +1074,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1167,13 +1098,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 .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 \
@@ -1242,71 +1166,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1317,10 +1211,36 @@ realclean: clean
  $(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 \
@@ -1329,11 +1249,8 @@ 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 \
@@ -1352,7 +1269,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1417,24 +1333,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1445,13 +1357,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
 # 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..8d09ec6d5ae 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -72,17 +72,17 @@ int
 main (int argc, char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-
+  
   ACE_TRY
     {
-
+      
       char* ior=0;
-
+  
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      // Parse the command-line arguments to get the IOR
+  
+      // Parse the command-line arguments to get the IOR 
       parse_args (argc, argv);
 
       // parse args should catch this, but just in case...
@@ -92,8 +92,8 @@ main (int argc, char **argv)
       // 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",
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "Cannot open input file for reading IOR: %s\n", 
                            iorfile),
                           -1);
       ACE_Read_Buffer ior_buffer (input_file);
@@ -105,16 +105,16 @@ main (int argc, char **argv)
       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 (),
+      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,
+      File::Descriptor_var fd = file_system->open (filename, 
+                                                   O_CREAT | O_RDWR, 
                                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -126,13 +126,13 @@ main (int argc, char **argv)
       // 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,
+      File::Descriptor::DataBuffer_var data_received = fd->read (message_length, 
                                                                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -142,7 +142,7 @@ main (int argc, char **argv)
       ACE_DEBUG((LM_DEBUG,"%s\n",
                  result));
 
-      // close the file
+      // close the file 
       fd->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
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..abe3a567b5f 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -54,7 +54,7 @@ parse_args (int argc, char **argv)
   return 0;
 }
 
-int
+int 
 main (int argc, char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -66,7 +66,7 @@ main (int argc, char **argv)
   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");
 
@@ -76,9 +76,9 @@ main (int argc, char **argv)
 
   PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
-
+  
   CORBA::PolicyList policies (5);
-  policies.length (5);
+  policies.length (5);  
 
   // ID Assignment Policy
   policies[0] =
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   policies[3] =
     root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
-
+  
   // Id Uniqueness Policy
   policies[4] =
     root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
@@ -111,14 +111,14 @@ main (int argc, char **argv)
                                                             policies,
                                                             ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
-
+  
   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_CHECK_RETURN (-1);
 
 
@@ -128,11 +128,11 @@ 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,
+  first_poa->activate_object_with_id (file_system_oid.in (), 
+                                      &file_system_impl, 
                                       ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
-
+    
   CORBA::Object_var file_system =
     first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
@@ -142,24 +142,23 @@ main (int argc, char **argv)
     orb->object_to_string (file_system.in (), ACE_TRY_ENV);
   ACE_CHECK_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);
@@ -169,10 +168,12 @@ main (int argc, char **argv)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
 
   // Destroy the rootPOA and its children
-  root_poa->destroy (1,
-                     1,
+  root_poa->destroy (1, 
+                     1, 
                      ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
+
+
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index 249417ccc49..a8290a286a3 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -112,71 +112,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -187,10 +157,36 @@ endif
  $(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 \
@@ -199,11 +195,8 @@ 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 \
@@ -222,7 +215,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -287,24 +279,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -315,13 +303,6 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
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..79d3d96ecb8 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -158,8 +158,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Policies for the firstPOA to be created.
-      CORBA::PolicyList policies (3);
-      policies.length (3);
+      CORBA::PolicyList policies (2);
+      policies.length (2);
 
       // Id Assignment Policy
       policies[0] =
@@ -173,12 +173,6 @@ main (int argc, char **argv)
                                           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 =
@@ -188,15 +182,6 @@ main (int argc, char **argv)
                               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 =
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index 4928f5964ba..7ca483ccdeb 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -107,71 +107,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -182,10 +152,36 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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,11 +190,8 @@ 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 \
@@ -217,7 +210,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -282,24 +274,20 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -309,13 +297,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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..476a18a4fe5 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -50,7 +50,7 @@ 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.
@@ -122,71 +122,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -197,10 +167,36 @@ realclean: clean
  $(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 \
@@ -209,11 +205,8 @@ 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 \
@@ -232,7 +225,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -297,24 +289,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -325,13 +313,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -400,71 +381,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -475,10 +426,36 @@ realclean: clean
  $(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 \
@@ -487,11 +464,8 @@ 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 \
@@ -510,7 +484,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -575,24 +548,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -603,13 +572,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(TAO_ROOT)/tao/corba.h \
@@ -678,71 +640,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -753,10 +685,36 @@ realclean: clean
  $(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 \
@@ -765,11 +723,8 @@ 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 \
@@ -788,7 +743,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -853,24 +807,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -881,13 +831,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -961,71 +904,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1036,10 +949,36 @@ realclean: clean
  $(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 \
@@ -1048,11 +987,8 @@ 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 \
@@ -1071,7 +1007,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1136,24 +1071,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1164,13 +1095,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1243,71 +1167,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1318,10 +1212,36 @@ realclean: clean
  $(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,11 +1250,8 @@ 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 \
@@ -1353,7 +1270,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1418,24 +1334,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1446,13 +1358,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1522,71 +1427,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1597,10 +1472,36 @@ realclean: clean
  $(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,11 +1510,8 @@ 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 \
@@ -1632,7 +1530,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1697,24 +1594,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1725,13 +1618,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
index 180cb15f302..43d7a8852c0 100644
--- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
@@ -78,7 +78,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO), 0);
         }
     }
   else // now forward, in throwing the ForwardRequest Exception
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 92b58c93cb7..2a0f62b2d73 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;
 
@@ -16,28 +15,28 @@ $brace="\#\#\#\#\#";
 
 # 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");
+		   "-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");
+		   "-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
 # just one
 @server3arglist = ("",
-                   "",
-                   "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url");
+		   "",
+		   "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url");
 
 # The client is run for all tests
 @clientarglist = ("-f server2 -i 5",
-                  "-g server2 -i 5",
-                  "-f server3 -i 8");
+		  "-g server2 -i 5",
+		  "-f server3 -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 = "";
 
@@ -76,19 +75,19 @@ sub run_test
 
     # 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");
+	$SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
+				 "$server3args");
         ACE::waitforfile ("server3");
     }
 
@@ -103,17 +102,17 @@ sub run_test
 
     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 +125,7 @@ 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/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..6e949e56a8f 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -64,7 +64,7 @@ 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.
@@ -136,71 +136,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -211,10 +181,36 @@ realclean: clean
  $(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,11 +219,8 @@ 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 \
@@ -246,7 +239,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -311,24 +303,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -339,13 +327,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -415,71 +396,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -490,10 +441,36 @@ realclean: clean
  $(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 \
@@ -502,11 +479,8 @@ 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 \
@@ -525,7 +499,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -590,24 +563,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -618,13 +587,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp MyFooServant.h FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -693,71 +655,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -768,10 +700,36 @@ realclean: clean
  $(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 \
@@ -780,11 +738,8 @@ 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 \
@@ -803,7 +758,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -868,24 +822,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -896,13 +846,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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..a3b4280154f 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);
@@ -159,17 +147,17 @@ main (int argc, char **argv)
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+                                            argv, 
+                                            0, 
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // 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,17 +166,17 @@ main (int argc, char **argv)
         }
 
       // Get an object reference from the argument string.
-      CORBA::Object_var object = orb->string_to_object (IOR,
+      CORBA::Object_var object = orb->string_to_object (IOR, 
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a Foo reference.
-      Foo_var foo = Foo::_narrow (object.in (),
+      Foo_var foo = Foo::_narrow (object.in (), 
                                   ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       CORBA::String_var ior =
-        orb->object_to_string (foo.in (),
+        orb->object_to_string (foo.in (), 
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -196,16 +184,16 @@ main (int argc, char **argv)
       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)
@@ -214,13 +202,6 @@ main (int argc, char **argv)
               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;
-            }
           else
             {
               // Invoke the doit() method of the foo reference.
@@ -232,10 +213,10 @@ main (int argc, char **argv)
       // 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);
@@ -244,9 +225,9 @@ main (int argc, char **argv)
 
       // 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
@@ -254,7 +235,7 @@ main (int argc, char **argv)
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Error!");
       return -1;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;  
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/examples/POA/Identity/Identity.cpp b/TAO/examples/POA/Identity/Identity.cpp
index 1b3673abd0d..e19c9c23be5 100644
--- a/TAO/examples/POA/Identity/Identity.cpp
+++ b/TAO/examples/POA/Identity/Identity.cpp
@@ -124,7 +124,6 @@ create_poas (PortableServer::POA_ptr root_poa,
 
 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,
@@ -133,130 +132,6 @@ test_poas (CORBA::ORB_ptr orb,
            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",
@@ -691,7 +566,6 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
-                 root_poa.in (),
                  first_poa.in (),
                  second_poa.in (),
                  third_poa.in (),
@@ -730,7 +604,6 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
-                 root_poa.in (),
                  first_poa.in (),
                  second_poa.in (),
                  third_poa.in (),
diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
index 0191598aa9d..d831cd2ec2e 100644
--- a/TAO/examples/POA/Identity/Makefile
+++ b/TAO/examples/POA/Identity/Makefile
@@ -40,7 +40,7 @@ Identity: $(addprefix $(VDIR),$(PROG_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
+	-/bin/rm -rf testC.* testS.* testS_T.*
 
 #----------------------------------------------------------------------------
 #	Dependencies
@@ -116,71 +116,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -191,10 +161,36 @@ realclean: clean
  $(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 \
@@ -203,11 +199,8 @@ 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 \
@@ -226,7 +219,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -291,24 +283,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -319,13 +307,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -394,71 +375,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -469,10 +420,36 @@ realclean: clean
  $(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 \
@@ -481,11 +458,8 @@ 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 \
@@ -504,7 +478,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -569,24 +542,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -597,13 +566,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -672,71 +634,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -747,10 +679,36 @@ realclean: clean
  $(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 \
@@ -759,11 +717,8 @@ 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 \
@@ -782,7 +737,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -847,24 +801,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -875,13 +825,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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..2e5107f8dca 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -66,7 +66,7 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   if (servant != 0)
     return servant;
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
                       0);
 }
 
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..dbef4f24377 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -72,7 +72,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
       return servant;
     }
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
                       0);
 }
 
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/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 4961df7a72e..b9b054c9fa4 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;
 
diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile
index 716a58d8166..32574c8b614 100644
--- a/TAO/examples/POA/Makefile
+++ b/TAO/examples/POA/Makefile
@@ -23,7 +23,6 @@ DIRS  = Generic_Servant \
 	On_Demand_Activation \
 	On_Demand_Loading \
 	RootPOA \
-	Reference_Counted_Servant \
 	TIE
 
 # The following test hasn't been updated yet
diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index 3975f9fa5db..e12edeebc3e 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -107,71 +107,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -182,10 +152,36 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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,11 +190,8 @@ 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 \
@@ -217,7 +210,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -282,24 +274,20 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -309,13 +297,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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..ba42a98857a 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -110,71 +110,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -185,10 +155,36 @@ endif
  $(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,11 +193,8 @@ 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 \
@@ -220,7 +213,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -285,24 +277,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -313,13 +301,6 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -392,71 +373,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -467,10 +418,36 @@ endif
  $(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,11 +456,8 @@ 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 \
@@ -502,7 +476,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -567,24 +540,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -595,13 +564,6 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -677,71 +639,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -752,10 +684,36 @@ endif
  $(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,11 +722,8 @@ 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 \
@@ -787,7 +742,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -852,24 +806,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -880,13 +830,6 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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..c8e65252532 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -44,7 +44,7 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
   else
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST ();
+      //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/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 3ee40ec6b0b..3948ddf4093 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -58,7 +58,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
       //
       //CORBA::Exception *exception =
-      //  new CORBA::OBJECT_NOT_EXIST ();
+      //  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..4c94fe6590d 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;
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index 4592f924297..065eba1ee7f 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))
@@ -46,6 +46,8 @@ endif
 .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-g++-common.h \
  Servant_Activator.h Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -112,70 +114,38 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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 \
@@ -187,10 +157,36 @@ endif
  $(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 \
@@ -199,31 +195,23 @@ 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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -245,8 +233,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 \
@@ -263,71 +254,46 @@ 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/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 \
  $(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 \
  $(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 \
@@ -393,70 +359,38 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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 \
@@ -468,10 +402,36 @@ endif
  $(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 \
@@ -480,31 +440,23 @@ 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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -526,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 \
@@ -544,69 +499,44 @@ 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/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/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-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -672,70 +602,38 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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 \
@@ -747,10 +645,36 @@ endif
  $(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 \
@@ -759,31 +683,23 @@ 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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -805,8 +721,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 \
@@ -823,69 +742,44 @@ 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/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/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-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -949,70 +843,38 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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 \
@@ -1024,10 +886,36 @@ endif
  $(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 \
@@ -1036,31 +924,23 @@ 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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1082,8 +962,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 \
@@ -1100,70 +983,45 @@ 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/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/DLL.h \
  Servant_Manager.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-g++-common.h \
  Servant_Activator.h Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1230,70 +1088,38 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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 \
@@ -1305,10 +1131,36 @@ endif
  $(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 \
@@ -1317,31 +1169,23 @@ 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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1363,8 +1207,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 \
@@ -1381,65 +1228,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/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_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..9b80e7a0552 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.
 
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/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 71eb22f9d5b..27994af1f7b 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -107,9 +107,9 @@ 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
+  ACE_TRY_NEW_ENV
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
@@ -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
+  ACE_TRY_NEW_ENV
     {  
       policies_.length (4);
       
@@ -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;
+   
+  ACE_TRY_NEW_ENV
     { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
@@ -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;
+   
+  ACE_TRY_NEW_ENV
     { 
       // An Servant Locator object is created which will activate 
       // the servant on demand.
@@ -328,8 +330,9 @@ 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;
+   
+  ACE_TRY_NEW_ENV
     { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 4961df7a72e..c902f9e081a 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';
diff --git a/TAO/examples/POA/On_Demand_Loading/svc.conf b/TAO/examples/POA/On_Demand_Loading/svc.conf
index a5a704c4cdc..816d3ba134d 100644
--- a/TAO/examples/POA/On_Demand_Loading/svc.conf
+++ b/TAO/examples/POA/On_Demand_Loading/svc.conf
@@ -1,5 +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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/README b/TAO/examples/POA/README
index eeb3dd50fa7..4c90b58d80e 100644
--- a/TAO/examples/POA/README
+++ b/TAO/examples/POA/README
@@ -109,9 +109,3 @@ these applications further.
                 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.
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..cbcaec694f3 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -106,71 +106,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -181,10 +151,36 @@ endif
  $(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,11 +189,8 @@ 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 \
@@ -216,7 +209,6 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -281,24 +273,20 @@ endif
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -308,13 +296,6 @@ endif
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 994405ba4ee..fcd3a13387e 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -59,7 +59,7 @@ 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
 
@@ -133,71 +133,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -208,10 +178,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -220,11 +216,8 @@ 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 \
@@ -243,7 +236,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -308,24 +300,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -336,13 +324,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -411,71 +392,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -486,10 +437,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -498,11 +475,8 @@ 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 \
@@ -521,7 +495,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -586,24 +559,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -614,13 +583,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/streams.h \
@@ -690,71 +652,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -765,10 +697,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -777,11 +735,8 @@ 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 \
@@ -800,7 +755,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -865,24 +819,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -893,13 +843,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -976,71 +919,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1051,10 +964,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1063,11 +1002,8 @@ 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 \
@@ -1086,7 +1022,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1150,24 +1085,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1178,13 +1109,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 .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 \
@@ -1253,71 +1177,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1328,10 +1222,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1340,11 +1260,8 @@ 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 \
@@ -1363,7 +1280,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1428,24 +1344,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1456,13 +1368,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index a85d1e14203..331a7f83ad8 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
+
+LDLIBS = -lorbsvcs -lTAO
+
+else
 
-#### 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
+
+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,22 @@ 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)
+	-I$(TAO_ROOT) $(TSS_ORB_FLAG)
 TAO_IDLFLAGS +=  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 realclean: clean
-	-$(RM) *C.* *S.* *S_T.*
+	-/bin/rm -rf *C.* *S.* *S_T.*
 
 .PRECIOUS: $(IDL_SRC)
 
@@ -103,12 +106,2505 @@ 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)/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/ORB.i \
+ $(TAO_ROOT)/tao/Any.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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/Invocation.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/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)/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/ORB.i \
+ $(TAO_ROOT)/tao/Any.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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/Invocation.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/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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/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)/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/Environment.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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/Invocation.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/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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/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)/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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/Invocation.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/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)/tao/IOR_LookupTable.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 \
+ $(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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/Invocation.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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/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/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/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 \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.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/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/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/client.conf b/TAO/examples/Quoter/client.conf
index 3c0cc0cc469..e20a50de114 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"
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 33b0a7acb04..f704fbc0968 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -122,7 +122,7 @@ Quoter_Client::run (void)
       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,
@@ -147,7 +147,7 @@ Quoter_Client::run (void)
       return -1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
@@ -263,8 +263,8 @@ Quoter_Client::init_naming_service (void)
 
       // Narrow it to a Quoter Generic Factory
       exception_message = "While narrowing the factory";
-      generic_Factory_var_ =
-        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (),
+      generic_Factory_var_ = 
+        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (), 
                                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -390,8 +390,7 @@ main (int argc, char **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 +401,4 @@ main (int argc, char **argv)
 
   return result;
 }
+
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..f7cbf29de6b 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"
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 3a4c64d1604..a1ff917f3ed 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)
@@ -62,24 +62,24 @@ Quoter_Server::init (int argc,
                     char* argv[],
                     CORBA::Environment &ACE_TRY_ENV)
 {
-  const char *exception_message = "Null Message";
+  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",
+        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];
 
@@ -87,26 +87,26 @@ Quoter_Server::init (int argc,
 
       // 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_,
+  
+      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);
+      quoter_Factory_i_ptr_->init (ACE_TRY_ENV);      
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var quoter_Factory_oid =
@@ -122,12 +122,12 @@ Quoter_Server::init (int argc,
       exception_message = "While quoter_Factor::_this";
       Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // 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);
-
+  
       exception_message = "While activating the POA Manager";
       poa_manager->activate (ACE_TRY_ENV);
 
@@ -142,7 +142,7 @@ Quoter_Server::init (int argc,
       ACE_RETHROW;
     }
   ACE_ENDTRY;
-
+  
   return this->init_naming_service (ACE_TRY_ENV);
 }
 
@@ -153,28 +153,28 @@ Quoter_Server::init (int argc,
 int
 Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 {
-  const char *exception_message = "Null Message";
-  ACE_TRY
+  const char *exception_message = "Null Message";  
+  ACE_TRY 
     {
       CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
 
-      CORBA::Object_var naming_obj =
+      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"),
+			               " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
 
       exception_message = "While narrowing naming context";
-      namingContext_var_ =
+      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);
@@ -185,7 +185,7 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
       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;
@@ -240,10 +240,8 @@ Quoter_Server::~Quoter_Server (void)
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR,
-                  "Could not unbind Quoter Server from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "~Quoter_Server");
+      ACE_ERROR ((LM_DEBUG, "Could not unbind Quoter Server from the Name Service\n"));
+      ACE_TRY_ENV.print_exception ("~Quoter_Server");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4dcc6bafa13..0f6747aacdd 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -7,9 +7,9 @@
 
 template <class Servant>
 Server<Servant>::Server (void)
-  : ior_output_file_ (0),
-    naming_ (0),
-    ins_ (0)
+    : ior_output_file_ (0),
+      naming_ (0),
+      ins_ (0)
 {
   // no-op.
 }
@@ -73,20 +73,20 @@ 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 ());
+  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 ins (this->ins_);
+  ACE_CString object_id (this->ins_);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"Adding (KEY:IOR) %s:%s\n",
-		ins.c_str (),
+		object_id.c_str (),
 		ior.in ()));
 
-  if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (ins,
-							object) != 0)
+  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);
@@ -229,7 +229,7 @@ Server<Servant>::register_name (void)
   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);
@@ -332,7 +332,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
   ACE_DECLARE_NEW_CORBA_ENV;
-
+ 
   ACE_TRY
     {
       // Retrieve the ORB.
@@ -346,6 +346,8 @@ Client<InterfaceObj, Var>::init (const char *name,
       if (this->parse_args () == -1)
         return -1;
 
+
+
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
@@ -421,7 +423,7 @@ Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TR
     }
   ACE_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Client::obtain_initial_references");
+      ACE_TRY_ENV.print_exception ("Bank::obtain_initial_references");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index fae106e9322..f9f199bbd32 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -62,7 +62,7 @@ AccountManager_i::open (const char *name,
           ACE_NEW_THROW_EX (result,
                             Account_i (name,
                                        initial_balance),
-                            CORBA::NO_MEMORY ());
+                            CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
           ACE_CHECK_RETURN (Bank::Account::_nil ());
 
           // Enter the new Account in the hash map. If the <bind>
@@ -73,7 +73,7 @@ AccountManager_i::open (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),
                                 Bank::Account::_nil ());
             }
         }
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index f2f16f9a476..d0f51f24f32 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,41 @@ 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 \
+	server.cpp \
+	Account_i.cpp \
+	AccountManager_i.cpp \
+	Bank_Client_i.cpp\
+	../Simple_util.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.o \
+		../Simple_util.o \
+		Bank_Client_i.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 \
+		../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
@@ -65,7 +60,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -76,18 +71,14 @@ 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.
@@ -159,71 +150,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -234,10 +195,36 @@ realclean: clean
  $(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 \
@@ -246,11 +233,8 @@ 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 \
@@ -269,7 +253,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -334,24 +317,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -362,13 +341,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -437,71 +409,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -512,10 +454,36 @@ realclean: clean
  $(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 \
@@ -524,11 +492,8 @@ 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 \
@@ -547,7 +512,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -612,24 +576,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -640,13 +600,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -715,32 +668,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -767,48 +747,14 @@ 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 \
@@ -827,7 +773,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -892,24 +837,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -920,13 +861,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +869,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1013,32 +948,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1065,48 +1027,14 @@ 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 \
@@ -1125,7 +1053,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1190,24 +1117,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1218,13 +1141,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1149,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1312,71 +1229,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1387,10 +1274,36 @@ realclean: clean
  $(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 \
@@ -1399,11 +1312,8 @@ 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 \
@@ -1422,7 +1332,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1487,24 +1396,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1515,13 +1420,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(ACE_ROOT)/ace/ACE.h \
@@ -1590,32 +1488,59 @@ 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 \
+ BankS.h BankC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1642,48 +1567,14 @@ 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 \
- 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 \
@@ -1702,7 +1593,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1767,24 +1657,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1795,13 +1681,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1870,32 +1749,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1922,48 +1828,14 @@ 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 \
@@ -1982,7 +1854,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2047,24 +1918,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2075,13 +1942,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2090,6 +1950,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -2168,32 +2029,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2220,48 +2108,14 @@ 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 \
@@ -2280,7 +2134,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2345,24 +2198,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2373,13 +2222,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2388,6 +2230,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
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/run_test.pl b/TAO/examples/Simple/bank/run_test.pl
index 7fcb67ec476..04bed456d85 100755
--- a/TAO/examples/Simple/bank/run_test.pl
+++ b/TAO/examples/Simple/bank/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/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 2a5c566cb80..79cc2ef1a8c 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,7 +78,7 @@ 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.
@@ -149,71 +150,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -224,10 +195,36 @@ realclean: clean
  $(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 \
@@ -236,11 +233,8 @@ 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 \
@@ -259,7 +253,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -324,24 +317,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -352,13 +341,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -428,71 +410,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -503,10 +455,36 @@ realclean: clean
  $(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 \
@@ -515,11 +493,8 @@ 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 \
@@ -538,7 +513,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -603,24 +577,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -631,13 +601,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -706,71 +669,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -781,10 +714,36 @@ realclean: clean
  $(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 \
@@ -793,11 +752,8 @@ 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 \
@@ -816,7 +772,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -881,24 +836,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -909,13 +860,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -987,71 +931,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1062,10 +976,36 @@ realclean: clean
  $(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 \
@@ -1074,11 +1014,8 @@ 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 \
@@ -1097,7 +1034,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1162,24 +1098,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1190,13 +1122,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1267,71 +1192,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1342,217 +1237,10 @@ realclean: clean
  $(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 \
- 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 \
@@ -1579,52 +1267,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 \
@@ -1633,11 +1275,8 @@ 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 \
@@ -1656,7 +1295,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1721,24 +1359,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1749,19 +1383,9 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
-.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 \
+ 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 \
@@ -1828,71 +1452,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1903,223 +1497,10 @@ realclean: clean
  $(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 \
- 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 \
@@ -2146,52 +1527,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 \
@@ -2200,11 +1535,8 @@ 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 \
@@ -2223,7 +1555,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2288,24 +1619,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2316,19 +1643,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/TAO.h
 .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 \
@@ -2396,71 +1714,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2471,10 +1759,36 @@ realclean: clean
  $(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 \
@@ -2483,11 +1797,8 @@ 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 \
@@ -2506,7 +1817,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2571,24 +1881,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2599,13 +1905,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2679,71 +1978,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2754,10 +2023,36 @@ realclean: clean
  $(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 \
@@ -2766,11 +2061,8 @@ 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 \
@@ -2789,7 +2081,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2854,24 +2145,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2882,13 +2169,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index e73f7525206..8de0c340728 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -62,7 +62,7 @@ Echo_i::echo_string (const char *mesg,
   // raised.
 
   if (str.in () == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), 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..df9ed6bd7b0 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,18 +67,14 @@ 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.
@@ -156,71 +146,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -231,10 +191,36 @@ realclean: clean
  $(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 \
@@ -243,11 +229,8 @@ 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 \
@@ -266,7 +249,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -331,24 +313,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -359,13 +337,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -434,71 +405,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -509,10 +450,36 @@ realclean: clean
  $(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 \
@@ -521,11 +488,8 @@ 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 \
@@ -544,7 +508,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -609,24 +572,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -637,13 +596,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -712,32 +664,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -764,48 +743,14 @@ 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 \
@@ -824,7 +769,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -889,24 +833,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -917,13 +857,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +865,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1010,32 +944,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1062,48 +1023,14 @@ 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 \
@@ -1122,7 +1049,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1187,24 +1113,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1215,13 +1137,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1145,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1309,71 +1225,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1384,10 +1270,36 @@ realclean: clean
  $(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 \
@@ -1396,11 +1308,8 @@ 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 \
@@ -1419,7 +1328,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1484,24 +1392,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1512,13 +1416,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1587,32 +1484,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1639,48 +1563,14 @@ 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 \
@@ -1699,7 +1589,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1764,24 +1653,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1792,13 +1677,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1685,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1885,32 +1764,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1937,48 +1843,14 @@ 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 \
@@ -1997,7 +1869,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2062,24 +1933,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2090,13 +1957,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1965,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
diff --git a/TAO/examples/Simple/echo/README b/TAO/examples/Simple/echo/README
index 019118524b4..80b77d34164 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,23 @@ 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
+-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
+-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..b668739078a 100644
--- a/TAO/examples/Simple/echo/client.dsp
+++ b/TAO/examples/Simple/echo/client.dsp
@@ -141,7 +141,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.dsp b/TAO/examples/Simple/echo/server.dsp
index 152d49b40fd..713c84e3e5d 100644
--- a/TAO/examples/Simple/echo/server.dsp
+++ b/TAO/examples/Simple/echo/server.dsp
@@ -133,7 +133,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..b10789fbf61 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -69,7 +69,7 @@ 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)
@@ -112,14 +112,12 @@ Grid_Client_i::run (char *name,
     }
   ACE_CATCH (CORBA::UserException, range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set grid");
+      ACE_PRINT_EXCEPTION (range_ex,"\tFrom get and set grid");
       return -1;
     }
   ACE_CATCH (CORBA::SystemException, memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make grid as Memory exhausted");
+      ACE_PRINT_EXCEPTION (memex,"Cannot make grid as Memory exhausted");
       return -1;
     }
   ACE_ENDTRY;
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..5d2eb994094 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -23,7 +23,7 @@ Grid_i::Grid_i (CORBA::Short x,
 {
   ACE_NEW_THROW_EX (array_,
                     CORBA::Long *[y],
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Allocate memory for the matrix.
@@ -32,7 +32,7 @@ Grid_i::Grid_i (CORBA::Short x,
     {
       ACE_NEW_THROW_EX (array_[ctr],
                         CORBA::Long[x],
-                        CORBA::NO_MEMORY ());
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
       ACE_CHECK;
     }
 
@@ -189,7 +189,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   // returns a null value if it fails
   ACE_NEW_THROW_EX (grid_ptr,
                     Grid_i (width, height, ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (Grid::_nil ());
 
   // Register the Grid pointer.
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..8430bb8de45 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,18 +68,14 @@ 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.
@@ -157,71 +147,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -232,10 +192,36 @@ realclean: clean
  $(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 \
@@ -244,11 +230,8 @@ 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 \
@@ -267,7 +250,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -332,24 +314,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -360,13 +338,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -435,71 +406,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -510,10 +451,36 @@ realclean: clean
  $(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 \
@@ -522,11 +489,8 @@ 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 \
@@ -545,7 +509,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -610,24 +573,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -638,13 +597,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -713,32 +665,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -765,48 +744,14 @@ 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 \
@@ -825,7 +770,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -890,24 +834,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -918,13 +858,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +866,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1011,32 +945,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1063,48 +1024,14 @@ 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 \
@@ -1123,7 +1050,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1188,24 +1114,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1216,13 +1138,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1146,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1310,71 +1226,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1385,10 +1271,36 @@ realclean: clean
  $(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 \
@@ -1397,11 +1309,8 @@ 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 \
@@ -1420,7 +1329,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1485,24 +1393,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1513,13 +1417,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1588,32 +1485,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1640,48 +1564,14 @@ 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 \
@@ -1700,7 +1590,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1765,24 +1654,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1793,13 +1678,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1686,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1886,32 +1765,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1938,48 +1844,14 @@ 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 \
@@ -1998,7 +1870,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2063,24 +1934,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2091,13 +1958,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1966,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
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/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..dd52cc52e10 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,18 +68,14 @@ 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.
@@ -157,71 +147,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -232,10 +192,36 @@ realclean: clean
  $(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 \
@@ -244,11 +230,8 @@ 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 \
@@ -267,7 +250,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -332,24 +314,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -360,13 +338,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -435,71 +406,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -510,10 +451,36 @@ realclean: clean
  $(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 \
@@ -522,11 +489,8 @@ 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 \
@@ -545,7 +509,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -610,24 +573,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -638,13 +597,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -713,32 +665,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -765,48 +744,14 @@ 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 \
@@ -825,7 +770,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -890,24 +834,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -918,13 +858,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +866,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1011,32 +945,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1063,48 +1024,14 @@ 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 \
@@ -1123,7 +1050,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1188,24 +1114,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1216,13 +1138,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1146,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1310,71 +1226,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1385,10 +1271,36 @@ realclean: clean
  $(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 \
@@ -1397,11 +1309,8 @@ 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 \
@@ -1420,7 +1329,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1485,24 +1393,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1513,13 +1417,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1588,32 +1485,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1640,48 +1564,14 @@ 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 \
@@ -1700,7 +1590,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1765,24 +1654,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1793,13 +1678,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1686,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -1886,32 +1765,59 @@ 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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1938,48 +1844,14 @@ 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 \
@@ -1998,7 +1870,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2063,24 +1934,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2091,13 +1958,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1966,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
diff --git a/TAO/examples/Simple/time/README b/TAO/examples/Simple/time/README
index c80a08a651d..fd67cadc9be 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,7 +41,7 @@ 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
+-n    number of iterations
 -k    IOR or The IOR can also be given in the format like file://[file.ior]
       with the full path
 	
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index 87b92ad471a..e3fa757f2ee 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 // $Id$
 
diff --git a/TAO/examples/Simple/time/client_static.dsp b/TAO/examples/Simple/time/client_static.dsp
index 8048d4c254e..af34fc6ef35 100644
--- a/TAO/examples/Simple/time/client_static.dsp
+++ b/TAO/examples/Simple/time/client_static.dsp
@@ -46,7 +46,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 +73,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"

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_static.dsp b/TAO/examples/Simple/time/server_static.dsp
index 91632009fdc..508b64e9a60 100644
--- a/TAO/examples/Simple/time/server_static.dsp
+++ b/TAO/examples/Simple/time/server_static.dsp
@@ -46,7 +46,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 +73,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"

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/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile
index 88ea73ab780..7bc4ae32d29 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/CDR_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/CDR_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/CDR_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/CDR_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/svc.conf b/TAO/examples/Simulator/DOVEMIB/svc.conf
index eb4772f319e..ded261a83eb 100644
--- a/TAO/examples/Simulator/DOVEMIB/svc.conf
+++ b/TAO/examples/Simulator/DOVEMIB/svc.conf
@@ -1,5 +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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 static 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..76c74f2cd4e 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
@@ -140,7 +140,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl  -I ..\..\..\ -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\bin\tao_idl  -I ..\..\..\orbsvcs\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..0e7e8b36a25 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
@@ -137,7 +137,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl    -I ..\..\..\  -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\bin\tao_idl  -I ..\..\..\orbsvcs\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..aaa97f5f663 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
@@ -136,7 +136,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl    -I ..\..\..\  -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\bin\tao_idl  -I ..\..\..\orbsvcs\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..feddd039570 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
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf b/TAO/examples/Simulator/Event_Supplier/svc.conf
index eb4772f319e..ded261a83eb 100644
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf
+++ b/TAO/examples/Simulator/Event_Supplier/svc.conf
@@ -1,5 +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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 static 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..152956be94d 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -213,18 +213,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>

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/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index c16764fd998..9a673e207a8 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -55,6 +55,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -119,7 +120,6 @@ 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 \
@@ -134,15 +134,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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 \
@@ -171,9 +162,16 @@ 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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/Concurrency/Concurrency_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -183,8 +181,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -192,6 +188,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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 \
@@ -206,10 +204,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -301,19 +299,17 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -324,13 +320,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index cf87f55089f..f55d35acbf9 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -2,12 +2,24 @@
 
 #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"),
+    scheduler_ (RtecScheduler::Scheduler::_nil ()),
+    rtec_ (RtecEventChannelAdmin::EventChannel::_nil ()),
+    cos_ec_ (CosEventChannelAdmin::EventChannel::_nil ()),
+    global_scheduler_ (0),
+    remote_Rtec_ (1),
+    eventTypeIds_ (0),
+    eventSourceIds_ (0),
+    source_type_pairs_ (0)
 {
   // No-Op.
 }
@@ -17,38 +29,60 @@ 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;
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    "",
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
+      CORBA::Object_var poa_object  =
+        this->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);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_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;
+
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in CosEvent_Service::init_ORB");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_NOTREACHED (return 0;)
 }
 
 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 +93,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 +137,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,204 +153,518 @@ 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"));
+  // 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;
+}
 
-  // initalize the ORB.
-  this->init_ORB (argc, argv,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
+int
+CosEvent_Service::get_Rtec_viaNamingService (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_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,
+				      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->resolve_naming_service (ACE_TRY_ENV);
-  ACE_CHECK;
+      // The CORBA::Object_var object is downcast to
+      // RtecEventChannelAdmin::EventChannel
+      // using the <_narrow> method.
+      this->rtec_ =
+        RtecEventChannelAdmin::EventChannel::_narrow (rtEC_obj.in (),
+                                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->init (this->poa_,
-              this->poa_,
-              this->eventTypeIds_,
-              this->eventSourceIds_,
-              this->source_type_pairs_,
-              ACE_TRY_ENV);
-  ACE_CHECK;
+      return 0;
+  }
+  ACE_CATCHANY
+   {
+     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                          "Exception in CosEvent_Service::get_Rtec_viaNamingService\n");
+     return -1;
+   }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
-  this->activate (ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_NOTREACHED (return 0;)
+}
 
-  // Register ourselves with the naming service.
-  ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
+int
+CosEvent_Service::start_Scheduler (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      if (this->global_scheduler_ == 0)
+        {
+          this->scheduler_ =
+            this->scheduler_impl_._this (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-  CORBA::Object_var obj =
-    this->poa_->servant_to_reference (this,
-                                      ACE_TRY_ENV);
-  ACE_CHECK;
+          CORBA::String_var str =
+            this->orb_->object_to_string (this->scheduler_.in (),
+                                          ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-  CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
+          ACE_DEBUG ((LM_DEBUG,
+                      "CosEvent_Service: The (local) scheduler IOR is <%s>\n",
+                      str.in ()));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "The CosEC 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,
+                                           ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->service_name);
+          // The CORBA::Object_var object is downcast to
+          // RtecScheduler::Scheduler using the <_narrow> method.
+          this->scheduler_ =
+            RtecScheduler::Scheduler::_narrow (sched_obj.in (),
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-  this->naming_->rebind (name,
-                         obj.in (),
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+          if (ACE_Scheduler_Factory::server (this->scheduler_.in ()) == -1)
+            return -1;
+        }
+
+      ACE_Scheduler_Factory::use_config (this->naming_client_.get_context());
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in CosEvent_Service::start_Scheduler\n");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Registered with the naming service as: %s\n",
-              this->service_name));
+  ACE_NOTREACHED (return 0;)
 }
+int
+CosEvent_Service::create_local_RtecService (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      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;
+
+      CORBA::String_var str = this->orb_->object_to_string (this->rtec_.in (),
+                                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEvent_Service::create_rtec (CORBA::Environment &ACE_TRY_ENV)
+      ACE_DEBUG ((LM_DEBUG,
+                  "CosEvent_Service: The RTEC IOR is <%s>\n",
+                  str.in ()));
+
+      this->ec_impl_->activate ();
+
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in CosEvent_Service::create_local_RtecService\n");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  ACE_NOTREACHED (return 0;)
+}
+
+void
+CosEvent_Service::init_SupplierQOS (RtecScheduler::handle_t supp_handle)
 {
-  // see if the user wants a local Rtec..
-  if (this->remote_Rtec_ == 0)
-    return CosEC_ServantBase::create_rtec (ACE_TRY_ENV);
-  else
-    return 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..
+    {
+      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::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEvent_Service::init_ConsumerQOS (RtecScheduler::handle_t cons_handle)
 {
-  // see if the user wants to use a local Rtec..
-  if (this->remote_Rtec_ == 0)
+  // @@ 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)
     {
-      CosEC_ServantBase::activate_rtec (ACE_TRY_ENV);
-      ACE_CHECK;
+      //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
+  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..
     {
-      // 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;
+      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::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::create_CosEC (void)
 {
-  // Check if the local rtec is to be deactivated.
-  if (this->remote_Rtec_ == 0)
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      RtecScheduler::handle_t supp_handle =
+        this->scheduler_->create ("supplier",
+                                  ACE_TRY_ENV);
+
+      ACE_TRY_CHECK;
+
+      this->init_SupplierQOS (supp_handle);
+
+      RtecScheduler::handle_t cons_handle =
+        this->scheduler_->create ("consumer",
+                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      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_.in (),
+                            ACE_TRY_ENV) != 0)
+        return -1;
+
+      ACE_TRY_CHECK;
+
+      this->cos_ec_ = this->ec_i_._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var str = this->orb_->object_to_string (this->cos_ec_,
+                                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "CosEvent_Service: The COSEC IOR is <%s>\n",
+                  str.in ()));
+      return 0;
+    }
+  ACE_CATCHANY
     {
-      CosEC_ServantBase::deactivate_rtec (ACE_TRY_ENV);
-      ACE_CHECK;
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in CosEvent_Service::create_CosEC");
+      return -1;
     }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  ACE_NOTREACHED (return 0;)
 }
 
-void
-CosEvent_Service::locate_rtec (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::register_CosEC (void)
 {
-  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;
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_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_,
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in CosEvent_Service::register_CosEC.\n");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  ACE_NOTREACHED (return 0;)
 }
 
-void
-CosEvent_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::startup (int argc, char *argv[])
 {
-  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;
+  // 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;
+
+  // 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);
+    }
+
+  // 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);
+      }
+
+
+  // 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;
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      if (!this->cos_ec_->_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,
+                                        ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          this->cos_ec_->destroy (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      this->ec_impl_->shutdown ();
+      delete ec_impl_;
 
-  // Unbind from the naming service.
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->service_name);
+      // shutdown the ORB.
+      if (!this->orb_->_nil ())
+        this->orb_->shutdown ();
 
-  this->naming_->unbind (name,
-                         ACE_TRY_ENV);
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception in shutdown.\n");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
-  // shutdown the ORB.
-  if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown ();
+  ACE_NOTREACHED (return 0;)
 }
 
 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 ();
 
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..a914783d6e7 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..1393a37c5dd 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -14,9 +14,7 @@ BIN2 = CosEvent_Service
 #### 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
+  BIN = $(BIN2)
 endif # CosEvent
 
 #----------------------------------------------------------------------------
@@ -52,6 +50,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -118,7 +117,6 @@ CosEvent_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/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -151,38 +149,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -203,10 +199,10 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -298,19 +294,17 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -321,13 +315,6 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -442,12 +429,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/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..203656d3581 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -117,7 +115,6 @@ 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 \
@@ -150,38 +147,36 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -202,10 +197,10 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -297,19 +292,17 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -320,13 +313,6 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 93118609611..f7d80d26207 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -11,15 +11,14 @@
 #include "orbsvcs/Event/Module_Factory.h"
 #include "orbsvcs/Event/Event_Channel.h"
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Null_Factory.h"
+#include "orbsvcs/Event/EC_Basic_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 ();
-
   Event_Service event_service;
   return event_service.run (argc, argv);
 }
@@ -28,6 +27,7 @@ int main (int argc, char *argv[])
 
 Event_Service::Event_Service (void)
   : module_factory_ (0),
+    factory_ (0),
     sched_impl_ (0),
     ec_impl_ (0),
     service_name_ (0),
@@ -44,6 +44,8 @@ Event_Service::~Event_Service (void)
   this->ec_impl_ = 0;
   delete this->sched_impl_;
   this->sched_impl_ = 0;
+  delete this->factory_;
+  this->factory_ = 0;
   delete this->module_factory_;
   this->module_factory_ = 0;
 }
@@ -128,13 +130,29 @@ Event_Service::run (int argc, char* argv[])
 
       switch (this->event_service_type_)
         {
-        case ES_NEW:
+        case ES_NULL_FILTERING:
           {
-            TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
-                                                  root_poa.in ());
+            ACE_NEW_RETURN (this->factory_,
+                            TAO_EC_Null_Factory (root_poa.in ()),
+                            1);
             TAO_EC_Event_Channel* ec;
             ACE_NEW_RETURN (ec,
-                            TAO_EC_Event_Channel (attr),
+                            TAO_EC_Event_Channel (this->factory_),
+                            1);
+            this->ec_impl_ = ec;
+            ec->activate (ACE_TRY_ENV);
+            ACE_TRY_CHECK;
+          }
+          break;
+
+        case ES_REACTIVE:
+          {
+            ACE_NEW_RETURN (this->factory_,
+                            TAO_EC_Basic_Factory (root_poa.in ()),
+                            1);
+            TAO_EC_Event_Channel* ec;
+            ACE_NEW_RETURN (ec,
+                            TAO_EC_Event_Channel (this->factory_),
                             1);
             this->ec_impl_ = ec;
             ec->activate (ACE_TRY_ENV);
@@ -183,7 +201,7 @@ Event_Service::run (int argc, char* argv[])
         this->orb_->object_to_string (ec.in (), ACE_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);
@@ -202,10 +220,10 @@ Event_Service::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (scheduler.in ()))
-        {
-          naming_context->unbind (schedule_name, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+	{
+	  naming_context->unbind (schedule_name, ACE_TRY_ENV);
+	  ACE_TRY_CHECK;
+	}
 
     }
   ACE_CATCHANY
@@ -235,10 +253,10 @@ Event_Service::parse_args (int argc, char *argv [])
           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.
+	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)
             {
@@ -259,9 +277,13 @@ Event_Service::parse_args (int argc, char *argv [])
           break;
 
         case 't':
-          if (ACE_OS::strcasecmp (get_opt.optarg, "NEW") == 0)
+          if (ACE_OS::strcasecmp (get_opt.optarg, "NULL_FILTERING") == 0)
+            {
+              this->event_service_type_ = ES_NULL_FILTERING;
+            }
+          else if (ACE_OS::strcasecmp (get_opt.optarg, "REACTIVE") == 0)
             {
-              this->event_service_type_ = ES_NEW;
+              this->event_service_type_ = ES_REACTIVE;
             }
           else if (ACE_OS::strcasecmp (get_opt.optarg, "OLD_REACTIVE") == 0)
             {
@@ -277,7 +299,7 @@ Event_Service::parse_args (int argc, char *argv [])
                           "Unknown event service type <%s> "
                           "defaulting to REACTIVE\n",
                           get_opt.optarg));
-              this->event_service_type_ = ES_NEW;
+              this->event_service_type_ = ES_REACTIVE;
             }
           break;
 
@@ -287,7 +309,7 @@ Event_Service::parse_args (int argc, char *argv [])
                       "Usage: %s "
                       "-n service_name "
                       "-s <global|local> "
-                      "-t <new|old_reactive|old_mt> "
+                      "-t <null_filtering|reactive|old_reactive|old_mt> "
                       "\n",
                       argv[0]));
           return -1;
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index b88ac45abe7..1d0f8351043 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -19,6 +19,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_Module_Factory;
+class TAO_EC_Factory;
 
 class Event_Service : public POA_RtecEventChannelAdmin::EventChannel
 {
@@ -57,7 +58,8 @@ private:
   // parse the command line args
 
   enum {
-    ES_NEW, // Use the Service Configurator to find factory
+    ES_NULL_FILTERING, // Single threaded, no-filtering
+    ES_REACTIVE,       // Thread-safe, reactive, filtering
     ES_OLD_REACTIVE,   // Reactive dispatching, old EC.
     ES_OLD_MT          // Prioritized dispatching, old EC.
   };
@@ -66,6 +68,9 @@ private:
   TAO_Module_Factory *module_factory_;
   // The module factory for the EC.
 
+  TAO_EC_Factory *factory_;
+  // The factory for the new EC.
+
   POA_RtecScheduler::Scheduler *sched_impl_;
   // The Scheduler implementation.
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 62c42cef9a2..a01468ad6a2 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,7 +34,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -60,6 +54,7 @@ Event_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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -119,7 +114,6 @@ 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/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -127,8 +121,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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 \
@@ -165,30 +157,30 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -209,10 +201,10 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -304,19 +296,17 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -327,13 +317,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -411,10 +394,12 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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_Null_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_Null_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
+ $(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
 
diff --git a/TAO/orbsvcs/Event_Service/svc.conf b/TAO/orbsvcs/Event_Service/svc.conf
deleted file mode 100644
index fa9576a1919..00000000000
--- a/TAO/orbsvcs/Event_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/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 5b3607b1a2a..1def42b6cf9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -2,7 +2,7 @@
 // $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"
@@ -11,9 +11,11 @@
 
 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
@@ -23,10 +25,10 @@ CORBA::Object_ptr
 ImplRepo_i::activate_object (CORBA::Object_ptr obj,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  /* Implementation_Repository::INET_Addr *new_addr; */
+  Implementation_Repository::INET_Addr *new_addr;
   TAO_Stub *new_stub_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)));
@@ -34,7 +36,7 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
   ACE_TRY
     {
       // @@ Where to get the poa name from?
-      /* new_addr = */ this->activate_server (0, ACE_TRY_ENV);
+      new_addr = this->activate_server (0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // @@ Use auto_ptr<> to avoid memory leaks!
@@ -43,7 +45,11 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
                 ACE_dynamic_cast (TAO_IIOP_Profile *,
                                   stub_obj->profile_in_use ());
 
-      TAO_MProfile mp(1);
+      TAO_MProfile *mp;
+      ACE_NEW_THROW_EX (mp,
+                        TAO_MProfile (1),
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       TAO_Profile *new_pfile;
       // @@ Would new_addr->host_ be different from object_addr()?
@@ -52,8 +58,8 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
                       TAO_IIOP_Profile (iiop_pfile->object_addr (),
                                         iiop_pfile->object_key ()),
                       CORBA::Object::_nil ());
-
-      mp.give_profile (new_pfile);
+      
+      mp->give_profile (new_pfile);
 
       // create new obj, pfile will be copied!
       new_stub_obj = new TAO_Stub (stub_obj->type_id,
@@ -82,13 +88,13 @@ ImplRepo_i::activate_server (const char *server,
                              CORBA::Environment &ACE_TRY_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));
@@ -151,7 +157,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));
@@ -213,22 +219,13 @@ ImplRepo_i::register_server (const char *server,
                              const Implementation_Repository::Process_Options &options,
                              CORBA::Environment &ACE_TRY_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);
 
@@ -241,16 +238,15 @@ ImplRepo_i::register_server (const char *server,
     }
   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));
@@ -266,25 +262,28 @@ ImplRepo_i::reregister_server (const char *server,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
-  Repository_Record rec (options.command_line_,
-                         options.environment_,
-                         options.working_directory_,
-                         "",
-                         0,
-                         "");
+  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));
@@ -298,7 +297,7 @@ ImplRepo_i::remove_server (const char *server,
 {
   if (this->repository_.remove (server) == 0)
     {
-      if (OPTIONS::instance()->debug () >= 1)
+      if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG,
                     "Successfully Removed Server\n"));
     }
@@ -322,14 +321,13 @@ ImplRepo_i::server_is_running (const char *server,
   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,
@@ -343,19 +341,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,
+                                                                           ACE_TRY_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));
@@ -368,7 +362,7 @@ ImplRepo_i::server_is_running (const char *server,
       return new_addr;
     }
 
-  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 +374,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 (),
@@ -396,17 +390,17 @@ ImplRepo_i::server_is_shutting_down (const char *server,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
-  Repository_Record rec;
+  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));
@@ -427,6 +421,69 @@ ImplRepo_i::server_is_shutting_down (const char *server,
     }
 }
 
+// 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)
 {
@@ -444,7 +501,10 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                           -1);
       ACE_TRY_CHECK;
 
-      int retval = OPTIONS::instance()->parse_args (argc, argv);
+      this->argc_ = argc;
+      this->argv_ = argv;
+
+      int retval = this->parse_args ();
 
       if (retval != 0)
         return retval;
@@ -457,17 +517,17 @@ 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  =
@@ -476,7 +536,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (OPTIONS::instance()->debug () >= 2)
+      if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "The IR IOR is: <%s>\n",
                     ir_var.in ()));
@@ -657,32 +717,51 @@ void
 IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
                       CORBA::Environment &ACE_TRY_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 (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_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 (ACE_TRY_ENV);
+  if (ACE_TRY_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 (ACE_TRY_ENV);
+  if (ACE_TRY_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;
+
+  ACE_TRY
+    {
+      new_addr = this->ir_impl_->activate_server (poa->the_name (),
+                                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_RETHROW;
+    }
+  ACE_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_Stub *stub_obj = ACE_dynamic_cast (TAO_Stub *,
                                          forward_object->_stubobj ());
@@ -694,8 +773,13 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
   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, ACE_TRY_ENV)));
+
   if (!CORBA::is_nil (forward_object))
-    ACE_THROW (PortableServer::ForwardRequest (forward_object));
+    ACE_TRY_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..49d5b0c4509 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,7 +47,7 @@ public:
 
   virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                           const char *name,
-                                          CORBA_Environment &ACE_TRY_ENV
+                                          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
@@ -73,9 +73,9 @@ public:
   // = Interface methods
 
   virtual CORBA::Object_ptr activate_object (CORBA::Object_ptr obj,
-                                             CORBA_Environment &ACE_TRY_ENV
+                                             CORBA_Environment &ACE_TRY_ENV 
                                                = CORBA_Environment::default_environment ());
-  // Starts up the server containing the object <obj> if not already running.
+  // Starts up the server containing the object <obj> if not already running.  
 
   virtual Implementation_Repository::INET_Addr *activate_server (const char *server,
                                                                  CORBA::Environment &env);
@@ -83,40 +83,40 @@ public:
 
   virtual void register_server (const char *server,
                                 const Implementation_Repository::Process_Options &options,
-                                CORBA_Environment &ACE_TRY_ENV
+                                CORBA_Environment &ACE_TRY_ENV 
                                   = CORBA_Environment::default_environment ());
-  // Adds the server to the repository and registers the startup information about
+  // Adds the server to the repository and registers the startup information about 
   // the server <server>.
 
   virtual void reregister_server (const char *server,
                                   const Implementation_Repository::Process_Options &options,
-                                  CORBA_Environment &ACE_TRY_ENV
+                                  CORBA_Environment &ACE_TRY_ENV 
                                     = CORBA_Environment::default_environment ());
   // Updates the startup information about the server <server>.
 
   virtual void remove_server (const char *server,
-                              CORBA_Environment &ACE_TRY_ENV
+                              CORBA_Environment &ACE_TRY_ENV 
                                 = CORBA_Environment::default_environment ());
   // Removes the server <server> from the repository.
 
-  virtual Implementation_Repository::INET_Addr
+  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 &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.
 
   virtual void server_is_shutting_down (const char * server,
-                                        CORBA_Environment &ACE_TRY_ENV
+                                        CORBA_Environment &ACE_TRY_ENV 
                                           = CORBA_Environment::default_environment ());
   // What the server should call before it shutsdown.
 
   // = Other methods
 
-  int init (int argc, char **argv,
-            CORBA_Environment &ACE_TRY_ENV
+  int init (int argc, char **argv, 
+            CORBA_Environment &ACE_TRY_ENV 
               = CORBA_Environment::default_environment ());
   // Initialize the Server state - parsing arguments and waiting.
 
@@ -139,9 +139,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 +162,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
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index 17b4781e9ba..4ccf1d5f7a6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -17,16 +17,14 @@ LDLIBS = -lorbsvcs -lTAO
 PROG_SRCS = \
         ImplRepo.cpp \
         ImplRepo_i.cpp \
-        Repository.cpp \
-        Options.cpp
+        Repository.cpp
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_SVR_OBJS = \
                 ImplRepo.o \
                 ImplRepo_i.o \
-                Repository.o \
-                Options.o
+                Repository.o
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -76,6 +74,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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 \
@@ -139,7 +138,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_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 \
@@ -172,38 +170,36 @@ 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 \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -224,10 +220,10 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -319,19 +315,17 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -342,13 +336,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +349,10 @@ 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 \
@@ -370,6 +361,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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 \
@@ -433,7 +425,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_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 \
@@ -466,38 +457,36 @@ 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 \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -518,10 +507,10 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -613,19 +602,17 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -636,13 +623,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -656,8 +636,13 @@ 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 \
- Options.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 \
@@ -665,9 +650,11 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/Naming_Context.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 \
@@ -675,21 +662,20 @@ 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 \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.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 \
@@ -704,36 +690,43 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/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 \
@@ -745,50 +738,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/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..18879fcf07b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
@@ -1,153 +1,111 @@
 /* -*- 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
+  char *lasts = 0; // For strtok_r
+  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_r (value, "\n", &lasts) + 1);
+      rec.env = ACE::strnew (ACE_OS::strtok_r (NULL, "\n", &lasts) + 1);
+      rec.wdir = ACE::strnew (ACE_OS::strtok_r (NULL, "\n", &lasts) + 1);
+      rec.host = ACE::strnew (ACE_OS::strtok_r (NULL, "\n", &lasts) + 1);
+      ::sscanf (ACE_OS::strtok_r (NULL, "\n", &lasts), "%hu", &rec.port);
+      rec.ping_ior = ACE::strnew (ACE_OS::strtok_r (NULL, "\n", &lasts) + 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 +113,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 +188,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/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 04d0450719e..88a6f53a4f1 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -67,6 +67,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -130,7 +131,6 @@ 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 \
@@ -163,38 +163,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -215,10 +213,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -310,19 +308,17 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -333,13 +329,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -376,20 +365,6 @@ 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/LifeCycle_Service_i.o .obj/LifeCycle_Service_i.so .shobj/LifeCycle_Service_i.o .shobj/LifeCycle_Service_i.so: LifeCycle_Service_i.cpp \
@@ -397,6 +372,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -461,7 +437,6 @@ 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 \
@@ -494,38 +469,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -546,10 +519,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -641,19 +614,17 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -664,13 +635,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -703,26 +667,13 @@ 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 \
  $(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 \
@@ -786,7 +737,6 @@ 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 \
@@ -819,38 +769,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -871,10 +819,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -966,19 +914,17 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -989,13 +935,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1005,20 +944,6 @@ 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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -1029,6 +954,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -1092,7 +1018,6 @@ 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 \
@@ -1125,38 +1050,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1177,10 +1100,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1272,19 +1195,17 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1295,13 +1216,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 8c7dfac04e2..7bc4b33f933 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -61,6 +61,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -125,7 +126,6 @@ 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 \
@@ -140,15 +140,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -177,9 +168,16 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -189,8 +187,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -198,6 +194,8 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -212,10 +210,10 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -307,19 +305,17 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -330,13 +326,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +353,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -428,7 +418,6 @@ 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 \
@@ -443,15 +432,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -480,9 +460,16 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -492,8 +479,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -501,6 +486,8 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -515,10 +502,10 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -610,19 +597,17 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -633,13 +618,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
index d88ef1d5de3..4ec3357464c 100644
--- a/TAO/orbsvcs/Makefile
+++ b/TAO/orbsvcs/Makefile
@@ -20,8 +20,7 @@ DIRS  =	orbsvcs \
 	Time_Service \
 	ImplRepo_Service \
 	CosEvent_Service \
-	tests \
-	examples
+	tests
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 0e1196806b1..e00ad1ef4d1 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -56,6 +56,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -121,7 +122,6 @@ 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 \
@@ -136,15 +136,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
@@ -173,9 +164,16 @@ 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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 \
@@ -185,8 +183,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -194,6 +190,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -208,10 +206,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -303,19 +301,17 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -326,13 +322,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index fca6408e072..a2a9b3318a4 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -114,7 +113,6 @@ 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 \
@@ -147,38 +145,36 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -199,10 +195,10 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -294,19 +290,17 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -317,13 +311,6 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index e33d2e4ab8f..452016c573e 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -80,6 +80,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -144,7 +145,6 @@ 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 \
@@ -159,15 +159,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -196,9 +187,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -208,8 +206,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -217,6 +213,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -231,10 +229,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -326,19 +324,17 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -349,13 +345,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -402,6 +391,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -466,7 +456,6 @@ 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 \
@@ -481,15 +470,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -518,9 +498,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -530,8 +517,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -539,6 +524,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -553,10 +540,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -648,19 +635,17 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -671,13 +656,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -720,6 +698,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -774,8 +753,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,7 +765,6 @@ 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 \
@@ -802,15 +779,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -839,9 +807,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -851,8 +826,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -860,6 +833,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -874,10 +849,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -969,19 +944,17 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -992,13 +965,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1041,6 +1007,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1054,8 +1021,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,7 +1072,6 @@ 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 \
@@ -1121,15 +1086,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1158,9 +1114,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -1170,8 +1133,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1179,6 +1140,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1193,10 +1156,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1288,19 +1251,17 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1311,13 +1272,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1367,6 +1321,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1426,7 +1381,6 @@ 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 \
@@ -1441,15 +1395,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1478,9 +1423,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/ImplRepoC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -1490,8 +1442,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1499,6 +1449,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1513,10 +1465,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1608,19 +1560,17 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1631,13 +1581,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 2cd37ee00be..437e16909c3 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -52,6 +52,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 .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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -118,7 +119,6 @@ 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 \
@@ -133,15 +133,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
@@ -170,9 +161,16 @@ 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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -185,8 +183,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -194,6 +190,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -208,10 +206,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -303,19 +301,17 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -326,13 +322,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 +335,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/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index bdb8d3cd6cc..d177401f17f 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)
     {
@@ -51,9 +51,9 @@ Trading_Service::Trading_Service (void)
       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 +70,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 +96,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 +119,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 +145,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 +165,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 +177,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 +186,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 +198,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 +230,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 +251,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 +264,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 +286,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 +307,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 +315,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 +348,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 +377,7 @@ Trading_Service::parse_args (int& argc, char *argv[])
       else
         arg_shifter.ignore_arg ();
     }
-
+  
   return 0;
 }
 
@@ -385,12 +385,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 +406,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/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..888ccbc1467 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1,4 +1,4 @@
-// $Id$
+ // $Id$
 
 // ============================================================================
 //
@@ -48,11 +48,11 @@ void
 TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &ACE_TRY_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, ACE_TRY_ENV);
 }
 
 // Start the transfer of data in the stream.
@@ -61,12 +61,11 @@ void
 TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
                              CORBA::Environment &ACE_TRY_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, ACE_TRY_ENV);
 }
 
 // Tears down the stream. This will close the connection, and delete
@@ -76,66 +75,61 @@ void
 TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &ACE_TRY_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, ACE_TRY_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)
 {
-  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 (ACE_TRY_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 &ACE_TRY_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 (ACE_TRY_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 &ACE_TRY_ENV)
 {
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (fp_name);
+  ACE_UNUSED_ARG (fp_settings);
+  ACE_UNUSED_ARG (ACE_TRY_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
@@ -151,26 +145,11 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
     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_StreamCtrl
 // ----------------------------------------------------------------------
 
 TAO_StreamCtrl::TAO_StreamCtrl (void)
-  :mcastconfigif_ (0),
-   mcastconfigif_ptr_ (0)
 {
 }
 
@@ -192,125 +171,78 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
   // 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"));
+        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"),
+                          0);
 
       // 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;
+      this->stream_endpoint_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"));
-        }
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
 
       // Request b_party to create the endpoint and vdev
 
-      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;
-        }
-
-      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);
-        }
+      this->stream_endpoint_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;
 
-      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;
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
 
-          this->sep_a_->connect_leaf (this->sep_b_.in (),
-                                      the_qos,
-                                      the_flows,
-                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n(%P|%t)stream_endpoint_b_ = %s",
+                  TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in (),
+                                                                      ACE_TRY_ENV)));
+      ACE_TRY_CHECK;
 
-      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);
+  // 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;
+      ACE_TRY_CHECK;
 
-          this->vdev_b_->set_peer (this->_this (ACE_TRY_ENV),
-                                   this->vdev_a_.in (),
-                                   the_qos,
-                                   the_flows,
-                                   ACE_TRY_ENV);
+      this->vdev_b_->set_peer (this->_this (ACE_TRY_ENV),
+                               this->vdev_a_.in (),
+                               the_qos,
+                               the_flows,
+                               ACE_TRY_ENV);
 
-          ACE_TRY_CHECK;
+      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;
-        }
+  // Now connect the streams together. This will
+  // establish the connection
+      this->stream_endpoint_a_->connect (this->stream_endpoint_b_.in (),
+                                         the_qos,
+                                         the_flows,
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -331,8 +263,8 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       const AVStreams::flowSpec &the_flows,
                       CORBA::Environment &ACE_TRY_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
     {
@@ -447,7 +379,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
     {
       // 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);
@@ -474,78 +406,6 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
   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)
-{
-}
-
 // ----------------------------------------------------------------------
 // TAO_Base_StreamEndPoint
 // ----------------------------------------------------------------------
@@ -579,8 +439,6 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                     const AVStreams::flowSpec &the_spec,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Boolean retv = 0;
-
   ACE_TRY
     {
       AVStreams::flowSpec flow_spec (the_spec);
@@ -596,7 +454,7 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       ACE_TRY_CHECK;
 
       // Make the upcall to the app
-      retv = this->handle_postconnect (flow_spec);
+      return this->handle_postconnect (flow_spec);
     }
   ACE_CATCHANY
     {
@@ -604,7 +462,7 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
-  return retv;
+  return 1;
 }
 
 
@@ -687,15 +545,15 @@ TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr ini
                                                CORBA::Environment &ACE_TRY_ENV)
 
 {
-  int result = 0;
+  int result;
   ACE_TRY
     {
       // Use the base class implementation of request_connection
-      TAO_StreamEndPoint::request_connection (initiator,
-                                              is_mcast,
-                                              qos,
-                                              the_spec,
-                                              ACE_TRY_ENV);
+      TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint_B>::request_connection (initiator,
+                                                                               is_mcast,
+                                                                               qos,
+                                                                               the_spec,
+                                                                               ACE_TRY_ENV);
 
       ACE_TRY_CHECK;
       // Make the upcall to the app
@@ -727,320 +585,6 @@ TAO_Server_StreamEndPoint::~TAO_Server_StreamEndPoint (void)
 {
 }
 
-
-// ----------------------------------------------------------------------
-// TAO_StreamEndPoint
-// ----------------------------------------------------------------------
-
-// constructor.
-
-TAO_StreamEndPoint::TAO_StreamEndPoint (void)
-  :flow_count_ (1)
-{
-  //  this->handle_open ();
-}
-
-// 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)
-{
-  // Make the upcall into the app
-  this->handle_stop (the_spec, ACE_TRY_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)
-{
-  // Make the upcall into the app
-  this->handle_start (flow_spec, ACE_TRY_ENV);
-}
-
-// Close the connection
-
-void
-TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &the_spec,
-                                 CORBA::Environment &ACE_TRY_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;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// 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,
-                                        AVStreams::streamQoS &qos,
-                                        AVStreams::flowSpec &the_spec,
-                                        CORBA::Environment &)
-{
-  ACE_UNUSED_ARG (initiator);
-  ACE_UNUSED_ARG (is_mcast);
-  ACE_UNUSED_ARG (qos);
-
-  ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
-  ACE_DEBUG ((LM_DEBUG,
-              "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
-              "flowspec has length = %d"
-              "and the strings are:",
-              the_spec.length ()));
-  for (u_int i = 0; i < the_spec.length (); i++)
-    ACE_DEBUG ((LM_DEBUG,
-                the_spec [i]));
-
-  return 0;
-}
-
-// @@ 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)
-{
-  ACE_UNUSED_ARG (new_qos);
-  ACE_UNUSED_ARG (the_flows);
-  ACE_UNUSED_ARG (ACE_TRY_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);
-  return 1;
-}
-
-
-void
-TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_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)
-{
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (fp_name);
-  ACE_UNUSED_ARG (fp_settings);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-}
-
-
-CORBA::Object_ptr
-TAO_StreamEndPoint::get_fep (const char *flow_name,
-                             CORBA::Environment &)
-{
-  TAO_String_Hash_Key fep_name_key (flow_name);
-  FlowEndPoint_Map::ENTRY *fep_entry = 0;
-  if (this->fep_map_.find (fep_name_key,fep_entry) == 0)
-    return fep_entry->int_id_;
-  return 0;
-}
-
-
-char *
-TAO_StreamEndPoint::add_fep (CORBA::Object_ptr the_fep,
-                                 CORBA::Environment &ACE_TRY_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
-    {
-      // 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);
-  return flow_name;
-}
-
-
-void
-TAO_StreamEndPoint::remove_fep (const char *flow_name,
-                                CORBA::Environment &ACE_TRY_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;
-}
-
-// @@ 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;
-}
-
-// 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;
-}
-
-// Set the source id.
-
-void
-TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
-                                   CORBA::Environment &)
-{
-  this->source_id_ = source_id;
-}
-
-
-TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
-{
-  //this->handle_close ();
-}
-
 // ----------------------------------------------------------------------
 // TAO_VDev
 // ----------------------------------------------------------------------
@@ -1063,7 +607,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
 
-  CORBA::Boolean result = 0;
+  CORBA::Boolean result;
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -1105,7 +649,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
         TAO_ORB_Core_instance ()->orb ()->string_to_object
         (media_ctrl_ior,ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       result = this->set_media_ctrl (media_ctrl_obj,ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
@@ -1375,20 +919,9 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr the_ep,
                        const char *vdev_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;
+  ACE_UNUSED_ARG (the_ep);
+  ACE_UNUSED_ARG (vdev_name);
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 // Adds the fdev object to the MMDevice.
@@ -1527,20 +1060,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_FlowConnection::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;
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 // modify the QoS for this flow.
@@ -1716,20 +1236,7 @@ TAO_FlowEndPoint::start (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_FlowEndPoint::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;
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 AVStreams::StreamEndPoint_ptr
@@ -1953,37 +1460,20 @@ TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
   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 &ACE_TRY_ENV)
 {
   // Right now since the A/V framework doesnt bother about the
   // protocols we leave it to the application to handle the connection
@@ -1995,7 +1485,7 @@ TAO_FlowEndPoint::connect_to_peer (AVStreams::QoS & the_qos,
 }
 
 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)
@@ -2008,15 +1498,6 @@ TAO_FlowEndPoint::handle_connect_to_peer (AVStreams::QoS & the_qos,
 }
 
 
-// ------------------------------------------------------------
-// TAO_FlowProducer class
-// ------------------------------------------------------------
-
-//default constructor
-TAO_FlowProducer::TAO_FlowProducer (void)
-{
-}
-
 //  multicast is currently not supported
 char *
 TAO_FlowProducer::connect_mcast (AVStreams::QoS & the_qos,
@@ -2084,6 +1565,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 &ACE_TRY_ENV)
+{
+  return this->handle_go_to_listen (the_qos,is_mcast,peer,flowProtocol,ACE_TRY_ENV);
+}
+
+char *
+TAO_FlowConsumer::handle_go_to_listen (AVStreams::QoS & the_qos,
+                               CORBA::Boolean is_mcast,
+                               AVStreams::FlowProducer_ptr peer,
+                               char *& flowProtocol,
+                               CORBA::Environment &ACE_TRY_ENV)
+{
+  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;
+}
+
 // ------------------------------------------------------------
 // TAO_FDev
 // ------------------------------------------------------------
@@ -2197,195 +1704,13 @@ TAO_FDev::bind_mcast (AVStreams::FDev_ptr first_peer,
 }
 
 void
-TAO_FDev::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
-                   const char * /* fdev_name */,
+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)
-{
-  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 (ACE_TRY_ENV);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -2397,8 +1722,18 @@ 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*>;
+template class TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint>;
+template class TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint_A>;
+template class TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint_B>;
+template class TAO_PropertySet<POA_AVStreams::StreamEndPoint>;
+template class TAO_PropertySet<POA_AVStreams::StreamEndPoint_A>;
+template class TAO_PropertySet<POA_AVStreams::StreamEndPoint_B>;
+template class TAO_PropertySet<POA_AVStreams::Basic_StreamCtrl>;
+template class TAO_PropertySet<POA_AVStreams::VDev>;
+template class TAO_PropertySet<POA_AVStreams::MMDevice>;
+template class TAO_PropertySet<POA_AVStreams::FlowConnection>;
+template class TAO_PropertySet<POA_AVStreams::FlowEndPoint>;
+template class TAO_PropertySet<POA_AVStreams::FDev>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA::Object_ptr>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
@@ -2408,6 +1743,16 @@ 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*>
+#pragma instantiate TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint>
+#pragma instantiate TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint_A>
+#pragma instantiate TAO_StreamEndPoint<POA_AVStreams::StreamEndPoint_B>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::StreamEndPoint>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::StreamEndPoint_A>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::StreamEndPoint_B>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::Basic_StreamCtrl>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::VDev>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::MMDevice>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::FlowConnection>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::FlowEndPoint>
+#pragma instantiate TAO_PropertySet<POA_AVStreams::FDev>
 #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..8f58330ee0f 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<POA_AVStreams::Basic_StreamCtrl>
+  // = 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
@@ -286,114 +216,13 @@ public:
   // Application needs to define this
 };
 
-class TAO_ORBSVCS_Export TAO_StreamEndPoint
-  : public virtual POA_AVStreams::StreamEndPoint,
-    public virtual TAO_Base_StreamEndPoint,
-    public virtual TAO_PropertySet,
-    public virtual PortableServer::RefCountServantBase
-{
-  // = DESCRIPTION
-  //    The Stream EndPoint. Used to implement one endpoint of a stream
-  //    that implements the transport layer.
-public:
-  TAO_StreamEndPoint (void);
-  // Constructor
-
-  virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ());
-   // Stop the stream. Empty the_spec means, for all the flows
-
-  virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Start the stream, Empty the_spec means, for all the flows
 
-  virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        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,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) = 0;
-  // Called by StreamCtrl. responder is the peer to connect to
-
-  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
-                                             CORBA::Boolean is_mcast,
-                                             AVStreams::streamQoS &qos,
-                                             AVStreams::flowSpec &the_spec,
-                                             CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Called by the peer StreamEndPoint. The flow_spec indicates the
-  // flows (which contain transport addresses etc.)
-
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_flows,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Change the transport qos on a stream
-
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
-                                                   CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Used to restrict the set of protocols
-
-  virtual void disconnect (const AVStreams::flowSpec &the_spec,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // disconnect the flows
-
-  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
-                             const char *fp_name,
-                             const CORBA::Any &fp_settings,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Used to control the flow
-
-  virtual CORBA::Object_ptr get_fep (const char *flow_name,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Not implemented in the light profile, throws notsupported
-
-  virtual char * add_fep (CORBA::Object_ptr the_fep,
-                          CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Not implemented in the light profile, throws notsupported
-
-  virtual void remove_fep (const char *fep_name,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Not implemented in the light profile, throws notsupported
-
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Used to "attach" a negotiator to the endpoint
-
-  virtual void set_key (const char *flow_name,
-                        const AVStreams::key & the_key,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Used for public key encryption.
-
-  virtual void set_source_id (CORBA::Long source_id,
-                              CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Used to set a unique id for packets sent by this streamendpoint
-
-  virtual ~TAO_StreamEndPoint (void);
-  // Destructor
-
-private:
-  u_int flow_count_;
-  // Count of the number of flows in this streamendpoint, used to
-  // generate unique names for the flows.
-  u_int flow_num_;
-  // current flow number used for system generation of flow names.
-  typedef ACE_Hash_Map_Manager <TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
-  FlowEndPoint_Map;
-  FlowEndPoint_Map fep_map_;
-  // hash table for the flownames and its corresponding flowEndpoint
-  // reference.
-  AVStreams::flowSpec flows_;
-  // sequence of supported flow names.
-  CORBA::Long source_id_;
-  // source id used for multicast.
-};
+// Include the templates here.
+#include "AVStreams_i_T.h"
 
 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_StreamEndPoint<POA_AVStreams::StreamEndPoint_A>,
+  public virtual TAO_Client_Base_StreamEndPoint
 {
   // = DESCRIPTION
   //     The "A" side of a streamendpoint
@@ -430,9 +259,8 @@ 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_StreamEndPoint<POA_AVStreams::StreamEndPoint_B>,
+  public virtual TAO_Server_Base_StreamEndPoint // Abstract interface
 {
   // = DESCRIPTION
   //     The "B" side of a streamendpoint
@@ -463,9 +291,8 @@ public:
 };
 
 class TAO_ORBSVCS_Export TAO_VDev
-  :public virtual TAO_PropertySet,
-   public virtual POA_AVStreams::VDev,
-   public virtual PortableServer::RefCountServantBase
+  :public virtual TAO_PropertySet<POA_AVStreams::VDev>,
+   public virtual POA_AVStreams::VDev
 // = DESCRIPTION
 //    Implements the VDev interface. One of these is created per connection,
 //    and represents device-specific parameters
@@ -514,7 +341,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
 
@@ -526,8 +353,8 @@ 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<POA_AVStreams::MMDevice>
+
 // = DESCRIPTION
 //     Implements a factory to create Endpoints and VDevs
 {
@@ -593,7 +420,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.
@@ -613,8 +440,8 @@ class TAO_FlowProducer;
 
 class TAO_ORBSVCS_Export TAO_FlowConnection
  : public virtual POA_AVStreams::FlowConnection,
-   public TAO_PropertySet,
-   public virtual PortableServer::RefCountServantBase
+   public TAO_PropertySet<POA_AVStreams::FlowConnection>
+					   
 {
   //  =TITLE
   //     Class to manage a flow connection.
@@ -678,7 +505,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 +516,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<POA_AVStreams::FlowEndPoint>
 {
   // = DESCRIPTION
   //     This class is used per flow e.g video flow and an audio flow
@@ -772,15 +598,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 +638,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 +661,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<POA_AVStreams::FDev>
 {
   public:
   TAO_FDev (void);
@@ -930,15 +751,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 +791,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/AVStreams_i_T.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i_T.cpp
new file mode 100644
index 00000000000..38fdbe0e388
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i_T.cpp
@@ -0,0 +1,306 @@
+// $Id$
+
+#ifndef TAO_AV_AVSTREAMS_I_T_C
+#define TAO_AV_AVSTREAMS_I_T_C
+
+#include "AVStreams_i.h"
+
+// ----------------------------------------------------------------------
+// TAO_StreamEndPoint
+// ----------------------------------------------------------------------
+
+// constructor.
+template <class IF>
+TAO_StreamEndPoint<IF>::TAO_StreamEndPoint (void)
+  :flow_count_ (1)
+{
+  //  this->handle_open ();
+}
+
+// Stop the physical flow of data on the stream
+// Empty the_spec --> apply to all flows
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::stop (const AVStreams::flowSpec &the_spec,
+                          CORBA::Environment &ACE_TRY_ENV)
+{
+  // Make the upcall into the app
+  this->handle_stop (the_spec, ACE_TRY_ENV);
+}
+
+// Start the physical flow of data on the stream
+// Empty the_spec --> apply to all flows
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::start (const AVStreams::flowSpec &flow_spec,
+                           CORBA::Environment &ACE_TRY_ENV)
+{
+  // Make the upcall into the app
+  this->handle_start (flow_spec, ACE_TRY_ENV);
+}
+
+// Close the connection
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::destroy (const AVStreams::flowSpec &the_spec,
+                             CORBA::Environment &ACE_TRY_ENV)
+{
+  // Make the upcall into the app
+  this->handle_destroy (the_spec, ACE_TRY_ENV);
+}
+// Called by our peer endpoint, requesting us to establish
+// a connection
+template <class IF>
+CORBA::Boolean
+TAO_StreamEndPoint<IF>::request_connection (AVStreams::StreamEndPoint_ptr initiator,
+                                        CORBA::Boolean is_mcast,
+                                        AVStreams::streamQoS &qos,
+                                        AVStreams::flowSpec &the_spec,
+                                        CORBA::Environment &)
+{
+  ACE_UNUSED_ARG (initiator);
+  ACE_UNUSED_ARG (is_mcast);
+  ACE_UNUSED_ARG (qos);
+
+  ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
+  ACE_DEBUG ((LM_DEBUG,
+              "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
+              "flowspec has length = %d"
+              "and the strings are:",
+              the_spec.length ()));
+  for (u_int i = 0; i < the_spec.length (); i++)
+    ACE_DEBUG ((LM_DEBUG,
+                the_spec [i]));
+
+  return 0;
+}
+
+// @@ Need to throw not-supported exception here
+template <class IF>
+CORBA::Boolean
+TAO_StreamEndPoint<IF>::modify_QoS (AVStreams::streamQoS &new_qos,
+                                const AVStreams::flowSpec &the_flows,
+                                CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (new_qos);
+  ACE_UNUSED_ARG (the_flows);
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  return 0;
+}
+
+// @@ Need to throw not-supported exception here
+template <class IF>
+CORBA::Boolean
+TAO_StreamEndPoint<IF>::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);
+  return 1;
+}
+
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::disconnect (const AVStreams::flowSpec &the_spec,
+                                CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+}
+
+// @@ Need to throw not-supported exception here
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::set_FPStatus (const AVStreams::flowSpec &the_spec,
+                                  const char *fp_name,
+                                  const CORBA::Any &fp_settings,
+                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (fp_name);
+  ACE_UNUSED_ARG (fp_settings);
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+}
+
+template <class IF>
+CORBA::Object_ptr
+TAO_StreamEndPoint<IF>::get_fep (const char *flow_name,
+                             CORBA::Environment &)
+{
+  TAO_String_Hash_Key fep_name_key (flow_name);
+  FlowEndPoint_Map::ENTRY *fep_entry = 0;
+  if (this->fep_map_.find (fep_name_key,fep_entry) == 0)
+    return fep_entry->int_id_;
+  return 0;
+}
+
+template <class IF>
+char *
+TAO_StreamEndPoint<IF>::add_fep (CORBA::Object_ptr the_fep,
+                                 CORBA::Environment &ACE_TRY_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
+    {
+      // 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);
+      return 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);
+  return flow_name;
+}
+
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::remove_fep (const char *flow_name,
+                                CORBA::Environment &ACE_TRY_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;
+}
+
+// @@ Need to throw not-supported exception here
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::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;
+}
+
+// Sets the public key used for this streamendpoint.
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::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;
+}
+
+// Set the source id.
+template <class IF>
+void
+TAO_StreamEndPoint<IF>::set_source_id (CORBA::Long source_id,
+                                   CORBA::Environment &)
+{
+  this->source_id_ = source_id;
+}
+
+template <class IF>
+TAO_StreamEndPoint<IF>::~TAO_StreamEndPoint (void)
+{
+  //this->handle_close ();
+}
+
+#endif /*TAO_AV_AVSTREAMS_I_T_C*/
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i_T.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i_T.h
new file mode 100644
index 00000000000..b7efc1415a4
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i_T.h
@@ -0,0 +1,118 @@
+// $Id$
+
+#ifndef TAO_AV_AVSTREAMS_I_T_H
+#define TAO_AV_AVSTREAMS_I_T_H
+
+template <class IF>
+class TAO_ORBSVCS_Export TAO_StreamEndPoint
+  : public virtual TAO_Base_StreamEndPoint,
+    public virtual TAO_PropertySet<IF>
+{
+  // = DESCRIPTION
+  //    The Stream EndPoint. Used to implement one endpoint of a stream
+  //    that implements the transport layer.
+public:
+  TAO_StreamEndPoint (void);
+  // Constructor
+
+  virtual void stop (const AVStreams::flowSpec &the_spec,
+                     CORBA::Environment &env = CORBA::Environment::default_environment ());
+   // Stop the stream. Empty the_spec means, for all the flows
+
+  virtual void start (const AVStreams::flowSpec &the_spec,
+                      CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Start the stream, Empty the_spec means, for all the flows
+
+  virtual void destroy (const AVStreams::flowSpec &the_spec,
+                        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,
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) = 0;
+  // Called by StreamCtrl. responder is the peer to connect to
+
+  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
+                                             CORBA::Boolean is_mcast,
+                                             AVStreams::streamQoS &qos,
+                                             AVStreams::flowSpec &the_spec,
+                                             CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Called by the peer StreamEndPoint. The flow_spec indicates the
+  // flows (which contain transport addresses etc.)
+
+  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
+                                     const AVStreams::flowSpec &the_flows,
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Change the transport qos on a stream
+
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
+                                                   CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Used to restrict the set of protocols
+
+  virtual void disconnect (const AVStreams::flowSpec &the_spec,
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // disconnect the flows
+
+  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
+                             const char *fp_name,
+                             const CORBA::Any &fp_settings,
+                             CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Used to control the flow
+
+  virtual CORBA::Object_ptr get_fep (const char *flow_name,
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Not implemented in the light profile, throws notsupported
+
+  virtual char * add_fep (CORBA::Object_ptr the_fep,
+                          CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Not implemented in the light profile, throws notsupported
+
+  virtual void remove_fep (const char *fep_name,
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Not implemented in the light profile, throws notsupported
+
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Used to "attach" a negotiator to the endpoint
+
+  virtual void set_key (const char *flow_name,
+                        const AVStreams::key & the_key,
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Used for public key encryption.
+
+  virtual void set_source_id (CORBA::Long source_id,
+                              CORBA::Environment &env = CORBA::Environment::default_environment ());
+  // Used to set a unique id for packets sent by this streamendpoint
+
+  virtual ~TAO_StreamEndPoint (void);
+  // Destructor
+
+private:
+  u_int flow_count_;
+  // Count of the number of flows in this streamendpoint, used to
+  // generate unique names for the flows.
+  u_int flow_num_;
+  // current flow number used for system generation of flow names.
+  typedef ACE_Hash_Map_Manager <TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
+  FlowEndPoint_Map;
+  FlowEndPoint_Map fep_map_;
+  // hash table for the flownames and its corresponding flowEndpoint
+  // reference.
+  AVStreams::flowSpec flows_;
+  // sequence of supported flow names.
+  CORBA::Long source_id_;
+  // source id used for multicast.
+};
+
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "AVStreams_i_T.cpp"
+#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("AVStreams_i_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* TAO_AV_AVSTREAMS_I_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 616552b1f05..d0554829cbf 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$")
 
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..d0888b681a7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -26,7 +26,6 @@ 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
     {
       this->activate_stream_endpoint (ACE_TRY_ENV);
@@ -47,7 +46,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -63,9 +61,9 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       if (this->make_vdev (vdev) == -1)
         return -1;
 
-      // Activate the object under the root poa.
+  // Put the object in the POA
       CORBA::String_var vdev_ior = this->orb_manager_->activate (vdev,
-                                                                 ACE_TRY_ENV);
+                                                                 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 ()));
@@ -73,8 +71,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       // 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
     {
@@ -98,7 +94,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       if (this->make_mediactrl (media_ctrl) == -1)
         return -1;
 
-      // Activate the mediactrl object under the root poa.
+  // Put the object in the POA
       CORBA::String_var mediactrl_ior = this->orb_manager_->activate (media_ctrl,
                                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -108,7 +104,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
       // 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),
+      anyval <<= this->orb_manager_->orb ()->object_to_string (media_ctrl->_this (env),
                                                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -219,8 +215,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
       // 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
     {
@@ -267,8 +261,6 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 
       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
     {
@@ -320,7 +312,6 @@ 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
     {
       // create the objects and activate them in the poa
@@ -364,53 +355,45 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
                                                                                 char **argv,
                                                                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // initialize the orb
-      this->orb_manager_.init (argc,
-                               argv,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // initialize the orb
+  this->orb_manager_.init (argc,
+                           argv,
+                           ACE_TRY_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 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 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;
+  // 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 stream_endpoint
+  CORBA::String_var stream_endpoint_ior = this->orb_manager_.activate (this->stream_endpoint_,
+                                                                       ACE_TRY_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_,
-                                                                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 vdev
+  CORBA::String_var vdev_ior = this->orb_manager_.activate (this->vdev_,
+                                                            ACE_TRY_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_,
-                                                                      ACE_TRY_ENV);
+  // activate the media controller
+  CORBA::String_var media_ctrl_ior = this->orb_manager_.activate (this->media_ctrl_,
+                                                                  ACE_TRY_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 ()));
 
-      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);
   return 0;
+
 }
 
 // Bind to the namingservice
@@ -418,27 +401,19 @@ 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)
 {
-  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 (),
+                                       ACE_TRY_ENV);
+  TAO_CHECK_ENV_RETURN (env,
+                        -1);
+
   return 0;
 }
 
@@ -447,70 +422,43 @@ 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)
 {
-  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;
+  char vdev_name [BUFSIZ];
+  ACE_OS::sprintf (vdev_name,
+                   "%s:%s:%d",
+                   "VDev",
+                   this->host_,
+                   this->pid_);
 
-      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)
+  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),
+                                                                       ACE_TRY_ENV);
+  this->vdev_->define_property ("Related_MediaCtrl",
+                                media_ctrl_property,
+                                ACE_TRY_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),
+                               ACE_TRY_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,
+                                     this->vdev_->_this (env),
                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
-      return -1;
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
 
@@ -520,7 +468,6 @@ 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
     {
       result = this->orb_manager_.run (ACE_TRY_ENV,tv);
@@ -543,7 +490,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_);
@@ -572,37 +519,24 @@ 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)
+  //  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),
+                               ACE_TRY_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,
+                                     this->stream_endpoint_->_this (env),
                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
-      return -1;
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
 
@@ -646,12 +580,11 @@ 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
     {
       this->naming_context_->unbind (this->stream_endpoint_name_,
@@ -683,7 +616,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 +642,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 +657,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/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index f103e7aa9a5..a588e05a55f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -3,23 +3,6 @@
 
 // $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)
@@ -35,10 +18,10 @@ TAO_SFP::TAO_SFP (CORBA::ORB_ptr orb,
                   SFP_Callback *callback)
   :orb_ (orb),
    reactor_ (reactor),
-   start_tries_ (10),
-   startReply_tries_ (10),
    timeout1_ (timeout1),
    timeout2_ (timeout2),
+   start_tries_ (10),
+   startReply_tries_ (10),
    callback_ (callback),
    sequence_num_ (0),
    credit_num_ (10),
@@ -229,6 +212,7 @@ TAO_SFP::start_stream (const char *local_addr,int Credit)
     }
   else
       ACE_ERROR_RETURN ((LM_ERROR,"Invalid messaged received while Start expected\n"),-1);
+  return 0;
 }
 
 // Sends the ACE_Message_Block data as a frame, fragmenting if necessary.
@@ -490,8 +474,7 @@ TAO_SFP::send_cdr_buffer (TAO_OutputCDR &cdr,ACE_Message_Block *mb)
   // from the heap.
   iovec iov[TAO_WRITEV_MAX];
   int iovcnt = 0;
-  const ACE_Message_Block* b = 0;
-  for (b = cdr.begin ();
+  for (const ACE_Message_Block* b = cdr.begin ();
        b != cdr.end () && iovcnt < TAO_WRITEV_MAX;
        b = b->cont ())
     {
@@ -587,9 +570,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;
 }
@@ -667,6 +647,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_num_ += credit.cred_num;
             break;
           }
         case flowProtocol::start:
@@ -725,8 +706,6 @@ TAO_SFP::handle_input (ACE_HANDLE fd)
             this->callback_->end_stream ();
             return -1;
           }
-        default:
-          break;
         }
       break;
     case REPLY_RECEIVED:
@@ -744,14 +723,7 @@ 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;
 }
@@ -759,9 +731,7 @@ TAO_SFP::handle_input (ACE_HANDLE fd)
 int
 TAO_SFP::end_stream (void)
 {
-  int result;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       ACE_DEBUG ((LM_DEBUG,"SFP - ending the stream\n"));
       // send the EndofStream message.
@@ -778,9 +748,9 @@ TAO_SFP::end_stream (void)
                                      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,
+      int result = this->reactor_->remove_handler (this,
                                                    ACE_Event_Handler::READ_MASK);
-
+      return result;
     }
   ACE_CATCHANY
     {
@@ -788,8 +758,6 @@ TAO_SFP::end_stream (void)
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  return result;
 }
                                   
 int
@@ -810,7 +778,6 @@ TAO_SFP::get_handle (void) const
 ACE_Message_Block *
 TAO_SFP::read_simple_frame (void)
 {
-  ACE_Message_Block *message_block = 0;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -826,7 +793,9 @@ TAO_SFP::read_simple_frame (void)
         return 0;
       int byte_order = frame_header.flags & 0x1;
       int message_len = frame_header.message_size;
-
+      if (frame_header.message_size < 0)
+        ACE_ERROR_RETURN ((LM_ERROR,"Negative message size\n"),0);
+      ACE_Message_Block *message_block;
       ACE_NEW_RETURN (message_block,
                       ACE_Message_Block (message_len),
                       0);
@@ -905,6 +874,8 @@ TAO_SFP::read_simple_frame (void)
 	      return 0;
             }
         }
+      else
+          return message_block;
     }
   ACE_CATCHANY
     {
@@ -913,7 +884,6 @@ TAO_SFP::read_simple_frame (void)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
-  return message_block;
 }
 
 int
@@ -973,9 +943,7 @@ TAO_SFP::read_frame_header (flowProtocol::frameHeader &frame_header)
 ACE_Message_Block *
 TAO_SFP::read_fragment (void)
 {
-  TAO_SFP_Fragment_Table_Entry *fragment_entry = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       flowProtocol::fragment fragment;
       ACE_INET_Addr sender;
@@ -1015,6 +983,8 @@ TAO_SFP::read_fragment (void)
       ACE_DEBUG ((LM_DEBUG,"frag number = %d, frag size = %d,source id  = %d\n",
                   fragment.frag_number,fragment.frag_sz,fragment.source_id));
 
+      if (fragment.frag_sz < 0)
+        ACE_ERROR_RETURN ((LM_ERROR,"negative fragment size:\n"),0);
       ACE_Message_Block *data;
       ACE_NEW_RETURN (data,
                       ACE_Message_Block(fragment.frag_sz),
@@ -1030,7 +1000,7 @@ TAO_SFP::read_fragment (void)
       ACE_DEBUG ((LM_DEBUG,"length of %dth fragment is: %d\n",
                   fragment.frag_number,
                   data->length ()));
-
+      TAO_SFP_Fragment_Table_Entry *fragment_entry;
       TAO_SFP_Fragment_Node *new_node;
       ACE_NEW_RETURN (new_node,
                       TAO_SFP_Fragment_Node,
@@ -1066,7 +1036,7 @@ TAO_SFP::read_fragment (void)
           // since fragment number starts from 0 to n-1 we add 1.
           fragment_entry->num_fragments_ = fragment.frag_number + 1;
         }
-
+      return check_all_fragments (fragment_entry);
     }
   ACE_CATCHANY
     {
@@ -1074,8 +1044,6 @@ TAO_SFP::read_fragment (void)
       return 0;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return check_all_fragments (fragment_entry);
 }
 
 ACE_Message_Block*
@@ -1126,21 +1094,3 @@ TAO_SFP::dump_buf(char *buffer,int size)
     ACE_DEBUG ((LM_DEBUG,"%d ",buf[i]));
   ACE_DEBUG ((LM_DEBUG,"n========================================n"));
 }
-
-#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..cd069169903 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -29,6 +29,22 @@
 #define SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE
 //#define SFP_MAX_PACKET_SIZE 100
 
+// 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";
+
+// SFP version 1.0
+const unsigned char TAO_SFP_MAJOR_VERSION = 1;
+const unsigned char TAO_SFP_MINOR_VERSION = 0;
+
+// lengths of various SFP headers
+const unsigned char TAO_SFP_FRAME_HEADER_LEN = 12;
 
 // various message class for SFP.
 
@@ -93,22 +109,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,
@@ -120,10 +120,10 @@ public:
   };
 
   TAO_SFP (CORBA::ORB_ptr orb,
-           ACE_Reactor* reactor,
-           ACE_Time_Value timeout1,
-           ACE_Time_Value timeout2,
-           SFP_Callback *callback);
+       ACE_Reactor* reactor,
+       ACE_Time_Value timeout1,
+       ACE_Time_Value timeout2,
+       SFP_Callback *callback);
   // constructor.
 
   virtual int start_stream (const char *receiver_addr);
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index cddb915e4c8..1d364a1d4ef 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -240,9 +240,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 +250,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 +284,7 @@ module AVStreams
         raises (PropertyException,
                 streamOpFailed);
       // Multicasting operations are not supported yet.
-  };
+    };
 
   interface StreamEndPoint : CosPropertyService::PropertySet{
       // = DESCRIPTION
@@ -374,7 +366,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 +627,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 +654,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 {
@@ -759,7 +750,6 @@ module AVStreams
   typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
   typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
   typedef sequence<FlowEndPoint> FlowEndPoint_seq;
-  typedef sequence<Object>  Object_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..abe9a2f728b 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -35,10 +35,10 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
-  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
+  TAO_IN_ENV.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet,
-                    CORBA::NO_MEMORY());
+                    CORBA::NO_MEMORY(CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
   return ls->_this (ACE_TRY_ENV);
@@ -54,10 +54,10 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
 
   // @@ I commented out the following statement becuase it doesn't make any
   //    sense at all.    -- Nanbor
-  //  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
+  //  TAO_IN_ENV.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet (which),
-                    CORBA::NO_MEMORY());
+                    CORBA::NO_MEMORY(CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
   return ls->_this (ACE_TRY_ENV);
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/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
index 26a990ce886..9a9b4854c61 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,32 +46,33 @@ 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,
@@ -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....
@@ -132,27 +122,30 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
   e.data.any_value = data;
 
   this->proxypushconsumer_->push (events,
-                                  ACE_TRY_ENV);
+                                  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->proxypushconsumer_->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
@@ -162,31 +155,14 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
   if (this->connected ())
     ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
 
-  TAO_CosEC_PushSupplierWrapper *wrapper;
-
-  ACE_NEW_THROW_EX (wrapper,
+  ACE_NEW_THROW_EX (this->wrapper_,
                     TAO_CosEC_PushSupplierWrapper (push_supplier),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-  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->proxypushconsumer_->connect_push_supplier (this->wrapper_->_this (ACE_TRY_ENV),
+                                                   this->qos_,
+                                                   ACE_TRY_ENV);
 }
 
 int
@@ -194,11 +170,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..0ca0df8aa7a 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
@@ -57,14 +51,14 @@ public:
   // 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:
@@ -82,8 +76,4 @@ private:
   // 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..9fced690fdd 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,48 @@ 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 &ACE_TRY_ENV)
 {
   if (this->connected ())
     ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
 
+
   if (push_consumer == CosEventComm::PushConsumer::_nil())
-    ACE_THROW (CORBA::BAD_PARAM ());
+    ACE_THROW (CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
 
-  TAO_CosEC_PushConsumerWrapper *wrapper;
-  ACE_NEW_THROW_EX (wrapper,
+  ACE_NEW_THROW_EX (this->wrapper_,
                     TAO_CosEC_PushConsumerWrapper (push_consumer),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-  auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
-
   // @@ 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 (ACE_TRY_ENV),
+                                       this->qos_,
+                                       ACE_TRY_ENV);
 }
 
 int
@@ -174,11 +148,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..92580b14283 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;
 
   ACE_NEW_RETURN (proxypushconsumer,
                   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 proxypushconsumer->_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/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/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
index 066d150ca0f..3b8beedb491 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl
@@ -521,4 +521,167 @@ module CosTrading
           
 }; /* end module CosTrading */
 
+
+// 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;
+};
+
 #endif /* TAO_TRADING_IDL */
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..4272e1179e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -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"));
 
@@ -382,7 +382,7 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
                   " 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
@@ -559,8 +559,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
     {
       // 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)
+      #if defined (TAO_USES_STRATEGY_SCHEDULER)
+        #if defined (TAO_USES_EDF_SCHEDULING)
 
           ACE_Deadline_Message_Strategy *adms = new ACE_Deadline_Message_Strategy;
 
@@ -569,7 +569,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 +578,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",
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 31c65a2a770..b709323b563 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -3,14 +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"
 
@@ -22,6 +20,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*
@@ -48,18 +48,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 +87,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
@@ -142,22 +134,22 @@ TAO_EC_Basic_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
   return new TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH> ();
 }
 
-TAO_EC_Scheduling_Strategy*
-TAO_EC_Basic_Factory::create_scheduling_strategy (TAO_EC_Event_Channel*)
+void
+TAO_EC_Basic_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
 {
-  return new TAO_EC_Null_Scheduling;
+  delete x;
 }
 
-void
-TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x)
+PortableServer::POA_ptr
+TAO_EC_Basic_Factory::consumer_poa (CORBA::Environment&)
 {
-  delete x;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-void
-TAO_EC_Basic_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
+PortableServer::POA_ptr
+TAO_EC_Basic_Factory::supplier_poa (CORBA::Environment&)
 {
-  delete x;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 ACE_Lock*
@@ -175,7 +167,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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index cee001ac85c..3cd157436d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -47,9 +47,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 +66,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
@@ -92,15 +90,16 @@ public:
       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 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*);
   virtual ACE_Lock* create_supplier_lock (void);
@@ -110,6 +109,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..6f52a5a67bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -18,20 +18,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 +40,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,7 +54,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_Disjunction_Filter (children, n);
@@ -69,7 +66,6 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       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);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 8b245bd0ce0..d97170906eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -52,13 +52,10 @@ public:
   // 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.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
index 2590494e730..504abd6af56 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
@@ -35,17 +35,4 @@ TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg)
   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
index b50e8c7ab3a..c32e4ad3b34 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
@@ -113,43 +113,6 @@ private:
 
 // ****************************************************************
 
-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__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
index fe46a45f115..6a5716a0e4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
@@ -11,6 +11,7 @@ TAO_EC_Connected_Command<Target,Object>::
 
 // ****************************************************************
 
+
 template<class Target, class Object>
 TAO_EC_Disconnected_Command<Target,Object>::
       TAO_EC_Disconnected_Command (Target *target,
@@ -20,11 +21,3 @@ TAO_EC_Disconnected_Command<Target,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..8bef3f88a71 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -62,24 +62,6 @@ TAO_EC_Conjunction_Filter::all_received (void) const
   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,
@@ -198,12 +180,3 @@ TAO_EC_Conjunction_Filter::can_match (
     }
   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..29b4c11c634 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -54,9 +54,6 @@ public:
 
   // = 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,9 +69,13 @@ public:
   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);
+
+  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;
 
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..ae76a78f0cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,8 +1,8 @@
 // $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"
 
@@ -21,11 +21,7 @@ TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel *ec,
     {
       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)
@@ -35,8 +31,15 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 }
 
 void
+TAO_EC_ConsumerAdmin::set_default_POA (PortableServer::POA_ptr poa)
+{
+  this->default_POA_ =
+    PortableServer::POA::_duplicate (poa);
+}
+
+void
 TAO_EC_ConsumerAdmin::connected (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 (),
@@ -50,14 +53,12 @@ TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushConsumer *consumer,
     {
       (*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 (),
@@ -71,60 +72,33 @@ TAO_EC_ConsumerAdmin::disconnected (TAO_EC_ProxyPushConsumer *consumer,
     {
       (*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);
 }
 
 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);
-}
-
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
 {
   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);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 4dee0091898..7fdf340e443 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -77,6 +77,18 @@ public:
   typedef TAO_EC_ProxyPushSupplier_Set::Busy_Lock Busy_Lock;
   Busy_Lock& busy_lock (void);
 
+  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;
+  // Delegate on the EC_ProxyPushSupplier....
+
+  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&);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*,
@@ -91,17 +103,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::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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
index ee065379a5e..9d316a56539 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
@@ -17,3 +17,27 @@ TAO_EC_ConsumerAdmin::busy_lock (void)
 {
   return this->supplier_set_->busy_lock ();
 }
+
+ACE_INLINE void
+TAO_EC_ConsumerAdmin::busy_hwm (CORBA::ULong hwm)
+{
+  this->supplier_set_->busy_hwm (hwm);
+}
+
+ACE_INLINE CORBA::ULong
+TAO_EC_ConsumerAdmin::busy_hwm (void) const
+{
+  return this->supplier_set_->busy_hwm ();
+}
+
+ACE_INLINE void
+TAO_EC_ConsumerAdmin::max_write_delay (CORBA::ULong hwm)
+{
+  this->supplier_set_->max_write_delay (hwm);
+}
+
+ACE_INLINE CORBA::ULong
+TAO_EC_ConsumerAdmin::max_write_delay (void) const
+{
+  return this->supplier_set_->max_write_delay ();
+}
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..6e4f2ad1703 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -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,
@@ -152,12 +134,3 @@ TAO_EC_Disjunction_Filter::can_match (
     }
   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..6a6cbbebfc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -52,12 +52,8 @@ public:
   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);
@@ -73,9 +69,13 @@ public:
   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);
+
+  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
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..8b99ed935cb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -61,10 +61,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 +77,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 +95,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..053b2054fc1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,13 +1,12 @@
 // $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"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Event_Channel.i"
@@ -15,39 +14,15 @@
 
 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;
-        }
-    }
+  ACE_ASSERT (this->factory_ != 0);
 
   this->dispatching_ =
     this->factory_->create_dispatching (this);
   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_ =
@@ -56,12 +31,6 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr,
     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);
 }
 
 TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
@@ -70,8 +39,6 @@ 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_);
@@ -80,16 +47,23 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
   this->timeout_generator_ = 0;
   this->factory_->destroy_observer_strategy (this->observer_strategy_);
   this->observer_strategy_ = 0;
-
-  if (this->own_factory_)
-    delete this->factory_;
 }
 
 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 ();
+
+  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
@@ -115,10 +89,6 @@ 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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 264417b61d3..a68171f1d80 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -35,55 +35,6 @@
 #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
 {
   // = TITLE
@@ -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...
@@ -137,9 +80,6 @@ public:
   TAO_EC_Timeout_Generator* timeout_generator (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*);
@@ -153,8 +93,8 @@ public:
   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);
@@ -164,13 +104,6 @@ public:
   // 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 +118,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);
@@ -218,7 +134,7 @@ public:
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
+		       CORBA::Environment &env)
       TAO_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
                        RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
@@ -230,28 +146,17 @@ public:
                        RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
 
 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
 
@@ -263,21 +168,6 @@ private:
 
   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
 };
 
 #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..549a3af4840 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
 {
@@ -50,12 +30,6 @@ TAO_EC_Event_Channel::timeout_generator (void) const
   return this->timeout_generator_;
 }
 
-ACE_INLINE TAO_EC_Scheduling_Strategy*
-TAO_EC_Event_Channel::scheduling_strategy (void) const
-{
-  return this->scheduling_strategy_;
-}
-
 ACE_INLINE TAO_EC_ProxyPushSupplier*
 TAO_EC_Event_Channel::create_proxy_push_supplier (void)
 {
@@ -93,15 +67,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 +101,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..396e43bf54a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -7,7 +7,7 @@
 //   ORBSVCS Real-time Event Channel
 //
 // = FILENAME
-//   EC_Factory
+//   EC_Filter
 //
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
@@ -32,7 +32,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/corba.h"
-#include "ace/Service_Object.h"
 
 class ACE_Lock;
 
@@ -40,7 +39,6 @@ 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;
@@ -48,9 +46,8 @@ 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_ORBSVCS_Export TAO_EC_Factory : public ACE_Service_Object
+class TAO_ORBSVCS_Export TAO_EC_Factory
 {
   // = TITLE
   //   Abstract base class for the Event Channel components.
@@ -80,12 +77,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
@@ -122,18 +113,19 @@ public:
       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;
   virtual ACE_Lock* create_supplier_lock (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index cee603fc208..f27a7d6e9bf 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
@@ -102,21 +76,9 @@ TAO_EC_Null_Filter::max_event_size (void) const
 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 &)
-
-{
-  return 0;
-}
-
 // ****************************************************************
 
 #if defined (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..00afafc720c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -72,18 +72,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;
@@ -117,29 +105,6 @@ public:
   // 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
-
-  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
 
 private:
   TAO_EC_Filter* parent_;
@@ -185,9 +150,6 @@ public:
   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);
 };
 
 // ****************************************************************
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..9e689156e0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -32,7 +32,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_EC_Filter;
-class TAO_EC_ProxyPushSupplier;
 
 class TAO_ORBSVCS_Export TAO_EC_Filter_Builder
 {
@@ -40,7 +39,7 @@ class TAO_ORBSVCS_Export TAO_EC_Filter_Builder
   //   Abstract base class for the filter builders.
   //
   // = DESCRIPTION
-  //   The creation of a filter hierarchy is controlled by a
+  //   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.)
@@ -51,9 +50,7 @@ public:
   // 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.
 
@@ -77,9 +74,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..1f68c500a66 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)
 {
 }
 
@@ -50,78 +46,58 @@ TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                            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_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (rmt_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,105 +105,52 @@ 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_->disconnect_push_consumer (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+  this->default_consumer_proxy_ =
+    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
-      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->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_;
@@ -238,22 +161,19 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       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);
         }
     }
 
@@ -316,59 +236,44 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       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 (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () == 0) return -1;
 
-  this->close_i (ACE_TRY_ENV);
-  ACE_CHECK_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..d5a240a1336 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -98,26 +98,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 +120,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 +157,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 +167,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 +219,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 +246,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 +267,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;
 
@@ -364,14 +354,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));
     }
 }
 
@@ -702,26 +692,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
@@ -1065,17 +1046,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 +1107,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.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
index 3f3188711df..867981c2f05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
@@ -75,13 +75,13 @@ 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..08722d3288c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -3,14 +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"
 
@@ -22,6 +20,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 +48,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 +87,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
@@ -134,28 +126,28 @@ TAO_EC_Null_Factory::destroy_observer_strategy (TAO_EC_ObserverStrategy *x)
   delete x;
 }
 
-TAO_EC_Scheduling_Strategy*
-TAO_EC_Null_Factory::create_scheduling_strategy (TAO_EC_Event_Channel*)
+TAO_EC_ProxyPushSupplier_Set*
+TAO_EC_Null_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
 {
-  return new TAO_EC_Null_Scheduling;
+  return new TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex> ();
 }
 
 void
-TAO_EC_Null_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x)
+TAO_EC_Null_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
 {
   delete x;
 }
 
-TAO_EC_ProxyPushSupplier_Set*
-TAO_EC_Null_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
+PortableServer::POA_ptr
+TAO_EC_Null_Factory::consumer_poa (CORBA::Environment&)
 {
-  return new TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex> ();
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-void
-TAO_EC_Null_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
+PortableServer::POA_ptr
+TAO_EC_Null_Factory::supplier_poa (CORBA::Environment&)
 {
-  delete x;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 ACE_Lock*
@@ -208,6 +200,10 @@ TAO_EC_Null_Factory::destroy_supplier_admin_lock (ACE_Lock* x)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+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_Null_Mutex>
+
 #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..a78fccace92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -46,9 +46,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 +65,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
@@ -91,15 +89,16 @@ public:
       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 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*);
   virtual ACE_Lock* create_supplier_lock (void);
@@ -109,6 +108,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
index ac02d5b112f..d7694da596f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -8,7 +8,6 @@
 #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"
@@ -86,21 +85,18 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
                      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);
-  }
+  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);
@@ -136,171 +132,27 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
 }
 
 void
-TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushConsumer *consumer,
-    CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Basic_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*,
+                                         CORBA::Environment &)
 {
-  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)
+TAO_EC_Basic_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*,
+                                            CORBA::Environment &)
 {
-  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)
+TAO_EC_Basic_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*,
+                                         CORBA::Environment &)
 {
-  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)
+TAO_EC_Basic_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*,
+                                            CORBA::Environment &)
 {
-  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
@@ -335,7 +187,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
               sub.dependencies[j].event;
             RtecEventComm::EventType type = event.header.type;
 
-            if (0 < type && type < ACE_ES_EVENT_UNDEFINED)
+            if (0 <= type && type <= ACE_ES_EVENT_UNDEFINED)
               continue;
             headers.insert (event.header, 1);
           }
@@ -350,7 +202,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
 
-  dep.length (count);
+  dep.length (count + 1);
 
   dep[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR;
   dep[0].event.header.source = 0;
@@ -390,7 +242,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
               pub.publications[j].event;
             RtecEventComm::EventType type = event.header.type;
 
-            if (0 < type && type < ACE_ES_EVENT_UNDEFINED)
+            if (0 <= type && type <= ACE_ES_EVENT_UNDEFINED)
               continue;
             headers.insert (event.header, 1);
           }
@@ -419,13 +271,9 @@ template class ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,T
 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>
@@ -435,11 +283,7 @@ template class ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var>;
 #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
index ed9c0b15ffb..78de7603223 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -92,7 +92,7 @@ public:
 
 // ****************************************************************
 
-class TAO_ORBSVCS_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_ObserverStrategy
+class TAO_EC_Null_ObserverStrategy : public TAO_EC_ObserverStrategy
 {
   // = TITLE
   //   A null observer strategy.
@@ -130,7 +130,7 @@ public:
 
 // ****************************************************************
 
-class TAO_ORBSVCS_Export TAO_EC_Basic_ObserverStrategy : public TAO_EC_ObserverStrategy
+class TAO_EC_Basic_ObserverStrategy : public TAO_EC_ObserverStrategy
 {
   // = TITLE
   //   A simple observer strategy.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 9aa562b6060..3e8d54bc927 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -5,7 +5,6 @@
 #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"
 
@@ -17,13 +16,10 @@ 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)
+  :  event_channel_ (ec)
 {
   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)
@@ -45,6 +41,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
     return;
 
   this->consumer_ = 0;
+  delete this;
 }
 
 void
@@ -55,19 +52,18 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier,
     return;
 
   const RtecEventChannelAdmin::SupplierQOS& pub =
-    this->consumer_->publications_i ();
+    this->consumer_->publications ();
 
   for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
     {
       const RtecEventComm::Event& event =
         pub.publications[j].event;
+      RtecEventComm::EventType type = event.header.type;
 
-      //      ACE_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n",
-      //                  event.header.source, event.header.type,
-      //                  this));
+      if (0 <= type && type <= ACE_ES_EVENT_UNDEFINED)
+        continue;
       if (supplier->can_match (event.header))
         {
-          //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
           this->supplier_set_->connected (supplier, ACE_TRY_ENV);
           return;
         }
@@ -82,17 +78,9 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier,
 }
 
 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];
@@ -100,13 +88,6 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
         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 ());
@@ -120,45 +101,10 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
            i != end;
            ++i)
         {
-          TAO_EC_QOS_Info qos_info = event_info;
+          TAO_EC_QOS_Info qos_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
index 33201e670c1..5dd989ab998 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -26,7 +26,6 @@
 #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
@@ -58,14 +57,11 @@ public:
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
+			  CORBA::Environment &env);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
-  virtual void shutdown (CORBA::Environment &env);
+			     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_;
@@ -77,33 +73,6 @@ private:
   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__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
index f1fc6e2687b..cfa1da318d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
@@ -1,9 +1 @@
 // $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..9c29b480614 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_.in ());
 }
 
 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_);
-
-        {
-          ACE_GUARD_THROW_EX (
-              TAO_EC_Unlock, ace_mon, reverse_lock,
-              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
+  if (this->is_connected ())
+    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
 
-          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..812cb48c706 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -60,7 +60,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 +78,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
+  void set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
 
-  const RtecEventChannelAdmin::SupplierQOS& publications_i (void) const;
-  // The QoS (subscription) used to connect to the EC, assumes the
-  // locks are held, use with care!
-
-  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 +121,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..c692963193e 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 ());
 }
 
 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
index b1d6d23fb99..259ff018bf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
@@ -27,7 +27,7 @@ TAO_EC_ProxyPushSupplier_Set::connected_i (
       CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->all_suppliers_.insert (supplier) != 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 }
 
 void
@@ -36,23 +36,11 @@ TAO_EC_ProxyPushSupplier_Set::disconnected_i (
       CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->all_suppliers_.remove (supplier) != 0)
-    return; // ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ());
+    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)
 {
 }
@@ -66,7 +54,6 @@ 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)
 
@@ -77,6 +64,5 @@ template class TAO_EC_Shutdown_Command<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
index 050446e1bf1..d4f828d0bac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
@@ -45,7 +45,6 @@
 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
 {
@@ -220,9 +219,6 @@ public:
   // 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);
@@ -235,20 +231,14 @@ protected:
   // 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.
+  // This two classes call the connected_i() and disconnected_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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp
index 0b832320644..c02dc23a9db 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp
@@ -49,16 +49,6 @@ TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::disconnected (
   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
@@ -111,6 +101,11 @@ TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::connected (
       ACE_NEW (command,
                TAO_EC_ProxyPushSupplier_Set::Connected_Command (this,
                                                         supplier));
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "EC (%P|%t) Delayed connection command = %x\n",
+                  command));
+
       this->command_queue_.enqueue_tail (command);
       this->write_delay_++;
     }
@@ -136,32 +131,8 @@ TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::disconnected (
       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",
+                  "EC (%P|%t) Delayed disconnection command = %x\n",
                   command));
 
       this->command_queue_.enqueue_tail (command);
@@ -180,6 +151,10 @@ TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::execute_delayed_operations
 
       command->execute ();
 
+      ACE_DEBUG ((LM_DEBUG,
+                  "EC (%P|%t) Executed delayed command = %x\n",
+                  command));
+
       delete command;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h
index 6da089b3396..aefe35ac2c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h
@@ -49,14 +49,17 @@ public:
   TAO_EC_ProxyPushSupplier_Set_Immediate (void);
   // Constructor.
 
-  // = Read the descriptions in EC_ProxyPushSupplier_Set
   virtual int busy (void);
   virtual int idle (void);
+  // The implementation of this methods is provided by derived
+  // classes, that provide appropiate locking.
+
   virtual void connected (TAO_EC_ProxyPushSupplier*,
                           CORBA::Environment&);
   virtual void disconnected (TAO_EC_ProxyPushSupplier*,
                              CORBA::Environment&);
-  virtual void shutdown (CORBA::Environment&);
+  // Used to inform the EC that a Supplier has connected or
+  // disconnected from it.
 
 private:
   ACE_LOCK lock_;
@@ -91,7 +94,6 @@ public:
                           CORBA::Environment&);
   virtual void disconnected (TAO_EC_ProxyPushSupplier*,
                              CORBA::Environment&);
-  virtual void shutdown (CORBA::Environment&);
 
 protected:
   virtual void execute_delayed_operations (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index bbc4163bf0c..9d612e50bd1 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,8 +11,6 @@
 
 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),
@@ -22,112 +19,80 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel* ec)
 {
   this->lock_ =
     this->event_channel_->create_supplier_lock ();
-
-  this->default_POA_ =
-    this->event_channel_->supplier_poa ();
 }
 
 TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 {
+  delete this->child_;
+  this->child_ = 0;
   this->event_channel_->destroy_supplier_lock (this->lock_);
 }
 
-void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer*,
-                                     CORBA::Environment &)
+CORBA::ULong
+TAO_EC_ProxyPushSupplier::_incr_refcnt (void)
 {
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
+  return this->refcount_++;
 }
 
-void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*,
-                                        CORBA::Environment &)
+CORBA::ULong
+TAO_EC_ProxyPushSupplier::_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_supplier (this);
+  return 0;
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*,
-                                     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_ProxyPushSupplier*,
-                                        CORBA::Environment &)
+PortableServer::POA_ptr
+TAO_EC_ProxyPushSupplier::_default_POA_i ()
 {
+  return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
-void
-TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+PortableServer::POA_ptr
+TAO_EC_ProxyPushSupplier::_default_POA (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 ();
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_,
+                    PortableServer::POA::_nil ());
+  return this->_default_POA_i ();
 }
 
 void
-TAO_EC_ProxyPushSupplier::cleanup_i (void)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer*,
+                                     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)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*,
+                                        CORBA::Environment &)
 {
-  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)
+void
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*,
+                                     CORBA::Environment &)
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-  return this->refcount_++;
 }
 
-CORBA::ULong
-TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
+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
@@ -143,55 +108,14 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
     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_THROW (RtecEventChannelAdmin::AlreadyConnected ());
 
     this->consumer_ =
       RtecEventComm::PushConsumer::_duplicate (push_consumer);
     this->qos_ = qos;
 
     this->child_ =
-      this->event_channel_->filter_builder ()->build (this,
-                                                      this->qos_,
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
+      this->event_channel_->filter_builder ()->build (this->qos_);
     this->adopt_child (this->child_);
   }
 
@@ -209,18 +133,18 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
-    if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-    this->cleanup_i ();
-  }
-
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_ =
+      RtecEventComm::PushConsumer::_nil ();
 
-  // Notify the event channel....
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+    PortableServer::POA_var poa =
+      this->_default_POA_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->_decr_refcnt ();
 }
 
@@ -251,25 +175,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_EX (
             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;
-  }
+  ACE_CHECK_RETURN (0);
 
-  this->event_channel_->destroy_proxy_push_supplier (this);
-  return result;
+  return this->child_->filter (event, qos_info, ACE_TRY_ENV);
 }
 
 int
@@ -277,25 +188,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_EX (
             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_nocopy (event, qos_info, ACE_TRY_ENV);
-    if (this->refcount_ > 0)
-      return result;
-  }
+  ACE_CHECK_RETURN (0);
 
-  this->event_channel_->destroy_proxy_push_supplier (this);
-  return result;
+  return this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
 }
 
 void
@@ -303,15 +201,15 @@ 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_++;
-  this->event_channel_->dispatching ()->push (this,
-                                              event,
-                                              qos_info,
-                                              ACE_TRY_ENV);
-  if (this->child_ != 0)
-    this->child_->clear ();
+  // 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).
+  if (this->is_connected_i ())
+    this->event_channel_->dispatching ()->push (this,
+                                                this->consumer_.in (),
+                                                event,
+                                                qos_info,
+                                                ACE_TRY_ENV);
+  this->child_->clear ();
 }
 
 void
@@ -319,103 +217,15 @@ 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_++;
-  this->event_channel_->dispatching ()->push_nocopy (this,
-                                                     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);
+  // 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).
+  if (this->is_connected_i ())
+    this->event_channel_->dispatching ()->push_nocopy (this,
+                                                       this->consumer_.in (),
+                                                       event,
+                                                       qos_info,
+                                                       ACE_TRY_ENV);
+  this->child_->clear ();
 }
 
 void
@@ -440,48 +250,5 @@ TAO_EC_ProxyPushSupplier::can_match (
 {
   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 &)
-{
-  this->_incr_refcnt ();
-}
-
-void
-TAO_EC_ProxyPushSupplier::_remove_ref (CORBA::Environment &)
-{
-  this->_decr_refcnt ();
-}
-
-#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..f889cfb8214 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -83,47 +83,41 @@ 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 set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
 
-  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 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);
+  virtual CORBA::ULong _incr_refcnt (void);
+  virtual CORBA::ULong _decr_refcnt (void);
   // Increment and decrement the reference count.
+  // @@ TODO We use the canonical tao form, but in the future we may
+  // want to add methods that follow the upcoming CORBA2.3
+  // specification, which will include reference counting for
+  // servants.
 
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet& event,
@@ -141,26 +135,13 @@ public:
   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 ());
 
 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_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index a5597b40d3d..6a59096ddcb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -24,7 +24,7 @@
 #ifndef TAO_EC_QOS_INFO_H
 #define TAO_EC_QOS_INFO_H
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@ class TAO_ORBSVCS_Export TAO_EC_QOS_Info
   //   filters.
   //
   // = DESCRIPTION
-  //   Filters compute QOS information for real-time dispatching, this
+  //   Filters compute QOS information for real-time dispatching, this 
   //   class encapsulates that information.
   //   This first implementation is just a place-holder.
   //
@@ -45,8 +45,6 @@ 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_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..f482f0316ae 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 ();
        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 ();
        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 =
     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..7394c2326e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -63,6 +63,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,10 +83,6 @@ 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 &);
@@ -102,9 +101,6 @@ private:
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 
-  ACE_Lock* lock_;
-  // The locking strategy
-
   ConsumerSet all_consumers_;
   // The set of consumers...
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp
index 6bb56e89909..15a1f6a03cf 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,68 @@ 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 ();
+
+  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 (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);
+
+      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;
+        }
+    }
+}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
index e9167f64c5d..8d0c6124186 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
@@ -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
index 77f15f3ea28..6bc7b0afa8c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -3,7 +3,6 @@
 #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"
 
@@ -15,12 +14,10 @@ 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)
 {
@@ -60,31 +57,22 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
                                                             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;
+  this->push (event, qos_info, ACE_TRY_ENV);
+  return 1;
 }
 
 int
 TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info,
-                                      CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info,
+                                   CORBA::Environment& ACE_TRY_ENV)
 {
-  return 0;
+  this->push_nocopy (event, qos_info, ACE_TRY_ENV);
+  return 1;
 }
 
 void
@@ -122,12 +110,3 @@ TAO_EC_Timeout_Filter::can_match (
 {
   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
index 9232bdb6e24..5045beac2af 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -34,7 +34,6 @@
 #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
 {
@@ -47,7 +46,6 @@ class TAO_ORBSVCS_Export TAO_EC_Timeout_Filter : public TAO_EC_Filter
   //
 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);
@@ -62,11 +60,6 @@ public:
   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,
@@ -84,9 +77,6 @@ public:
   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
@@ -98,9 +88,6 @@ 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.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 93176469a1e..8cc5e206761 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -40,9 +40,9 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
       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);
+      filter->filter (single_event,
+                      qos_info,
+                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
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..93b624eb363 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -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;
@@ -80,24 +80,5 @@ 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);
+  return TAO_EC_Filter::matches (this->header_, header);
 }
-
-int
-TAO_EC_Type_Filter::add_dependencies (
-      const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
-{
-  return this->can_match (header);
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index c9d6b7d7b1a..81c7835a916 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -61,9 +61,6 @@ public:
   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_Type_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 2f8f9662fea..0b3f949aa50 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
@@ -601,12 +604,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 +644,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 +661,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 +698,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 +1125,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 +1142,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 +1169,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 +1182,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 +1221,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 +1229,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 +1239,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 +1255,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
@@ -1270,13 +1270,13 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
   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"));
 
@@ -1323,11 +1323,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 +1332,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
@@ -2093,57 +2084,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 +2364,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 +3132,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 +3159,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 +3168,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 +3194,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 +3223,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)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 71792377d92..7859e667756 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
@@ -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..2a597943068 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)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/README b/TAO/orbsvcs/orbsvcs/Event/README
index a4c88f35452..c8d2ebc84f2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/README
+++ b/TAO/orbsvcs/orbsvcs/Event/README
@@ -94,17 +94,6 @@ components:
       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
   channel and its consumers); the object delegates on the event
@@ -234,23 +223,9 @@ components:
     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:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index 05c3f23f6d3..2704606800a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -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
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/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 9aba0522e27..60f97f8e3cf 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -48,18 +48,18 @@ TAO_IOR_Multicast::init (const char *ior,
   this->ior_ = ior;
   this->response_addr_.set ((u_short) 0);
   this->response_.open (this->response_addr_);
-
+  
   // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
   if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "subscribe"),
                       -1);
-
+  
   // Initialise the IOR_LookupTable.
-
+  
   //  this->ior_lookup_table_.add_ior ("ObjectID1","iioploc://tango.cs.wustl.edu:9999/ObjectID1");
-
+  
   return 0;
 }
 
@@ -76,16 +76,14 @@ 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);
-
+  
+  char * name;
+  ACE_NEW_RETURN (name, char [BUFSIZ], 0);
+  
   CORBA::String_var service_name (name);
-
+  
   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),
@@ -94,37 +92,38 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   if (n <= 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "TAO_IOR_Multicast::handle_input - peek %d\n",
-		       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),
+		       n), 
 		      0);
+  
   // Null terminate.
   service_name [ACE_NTOHS (header) - sizeof (ACE_UINT16)] = 0;
-
+  
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"(%P|%t) Received multicast.\n"
@@ -132,47 +131,43 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 		"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)
+  
+  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.
-
+      // 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);
     }
-
+  
   ACE_SOCK_Connector connector;
   ACE_INET_Addr peer_addr (ACE_NTOHS (remote_port),
 			   remote_addr.get_host_name ());
   ACE_SOCK_Stream stream;
-
+  
   // Connect.
   if (connector.connect (stream,
                          peer_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACE_ERROR_RETURN ((LM_DEBUG,
 		       "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;
-
+  
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) ior_: <%s>\n"
@@ -184,3 +179,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                 result));
   return 0;
 }
+
+
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
index ae7ebbc6ffc..2a8866b75d3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
@@ -44,7 +44,7 @@ Logger_Factory_i::make_logger (const char *name,
       // exception and returns a null value if it fails
       ACE_NEW_THROW_EX (result,
                         Logger_i (name),
-                        CORBA::NO_MEMORY ());
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (Logger::_nil ());
     }
 
@@ -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
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index edb11a0e1a7..70ec35fee3f 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -24,7 +24,7 @@ endif
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
-        -I$(TAO_ROOT) \
+	-I$(TAO_ROOT) \
         -Wb,export_macro=TAO_ORBSVCS_Export \
         -Wb,export_include=orbsvcs_export.h \
         $(TAO_LACKS_EVENT_CHANNEL_ANY)
@@ -46,143 +46,88 @@ ifndef TAO_ORBSVCS
   #### Please see docs/configurations.html#orbsvcs for documentation of
   #### TAO_ORBSVCS.
   TAO_ORBSVCS = Naming \
-                ImplRepo \
                 Time \
                 Log \
                 Concurrency \
+                LifeCycle \
+                ImplRepo \
                 Property \
                 Trader \
-                LifeCycle \
                 Sched \
                 Event \
                 CosEvent \
-                Event2 \
-                AV
+                AV \
+		Event2
 endif # TAO_ORBSVCS
 
 ####
 #### 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
+ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosNaming
   TAO_ORBSVCS_SRCS += \
-        AV/AVStreams_i \
-        AV/Endpoint_Strategy \
-        AV/Endpoint_Strategy_T\
-	AV/sfp
-endif # AV
+        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
 
-ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
-  ifeq (,$(findstring Event,$(TAO_ORBSVCS)))
-    IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
-  endif # ! Event
+ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
+  IDL_SRCS += TimeBase TimeService
   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
+        Time_Utilities \
+        Time/TAO_Time_Service_Server \
+        Time/TAO_Time_Service_Clerk \
+        Time/TAO_UTO \
+        Time/TAO_TIO \
+        Time/Timer_Helper
 
-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 \
-	CosEvent_Utilities
-endif # CosEvent
+  #### TAO's Time Service requires its ImplRepo Service.
+  ifeq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
+    #### Add ImplRepo
+    TAO_ORBSVCS += "ImplRepo "
+  endif # ! ImplRepo
+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\
+	Property/CosPropertyService_i_T
+endif # Property
+
 ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosTrading CosTradingDynamic CosTradingRepos
+  IDL_SRCS += CosTrading
   TAO_ORBSVCS_SRCS += \
         Trader/Constraint_Interpreter \
         Trader/Constraint_Nodes \
@@ -201,71 +146,94 @@ ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
   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
+    TAO_ORBSVCS_SRCS += \
+        IOR_Multicast
+  endif # Naming
 endif # Trader
 
-ifneq (,$(findstring Property,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosPropertyService
+ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecScheduler
   TAO_ORBSVCS_SRCS += \
-        Property/CosPropertyService_i
-endif # Property
+        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 Concurrency,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosConcurrencyControl
+ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
   TAO_ORBSVCS_SRCS += \
-        Concurrency/CC_Lock \
-        Concurrency/CC_LockSet \
-        Concurrency/CC_LockSetFactory \
-        Concurrency/Concurrency_Utils
-endif # Concurrency
+        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 Log,$(TAO_ORBSVCS)))
-  IDL_SRCS += Logger
+ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
   TAO_ORBSVCS_SRCS += \
-        Log/Logger_i
-endif # Log
+	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 \
+	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
+endif # Event2
 
-ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
-  IDL_SRCS += TimeBase TimeService
+ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosEventComm CosEventChannelAdmin
   TAO_ORBSVCS_SRCS += \
-        Time_Utilities \
-        Time/TAO_Time_Service_Server \
-        Time/TAO_Time_Service_Clerk \
-        Time/TAO_UTO \
-        Time/TAO_TIO \
-        Time/Timer_Helper
-
-  #### TAO's Time Service requires its ImplRepo Service.
-  ifeq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-    #### Add ImplRepo
-    TAO_ORBSVCS += ImplRepo
-  endif # ! ImplRepo
-endif # Time
-
-ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  IDL_SRCS += Ping ImplRepo
-  TAO_ORBSVCS_SRCS +=
-endif # ImplRepo
+        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\
+	AV/AVStreams_i_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
@@ -284,10 +252,10 @@ 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))
 
 #
-# 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
@@ -308,43 +276,47 @@ $(foreach ext, $(IDL_EXT), ImplRepo$(ext)): Ping.idl
 
 idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
+	-/bin/rm -rf $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 	@$(ACE_ROOT)/bin/ace_components --orbsvcs --remove
 
 .PHONY: ORBSVCS_COMPONENTS
 ORBSVCS_COMPONENTS:
-	@$(ACE_ROOT)/bin/ace_components --orbsvcs --set " $(TAO_ORBSVCS) "
+	@$(ACE_ROOT)/bin/ace_components --orbsvcs \
+         --set " $(TAO_ORBSVCS) "
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/AVStreamsS.o .obj/AVStreamsS.so .shobj/AVStreamsS.o .shobj/AVStreamsS.so: AVStreamsS.cpp AVStreamsS.h CosPropertyServiceS.h \
- CosPropertyServiceC.h \
+.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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,13 +358,10 @@ 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 \
@@ -425,38 +394,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -479,8 +446,6 @@ 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 \
@@ -572,19 +537,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -595,39 +558,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -669,18 +626,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -708,38 +673,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -762,8 +719,6 @@ 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 \
@@ -855,19 +810,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -878,36 +831,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -949,18 +899,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -988,38 +946,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1042,8 +992,6 @@ 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 \
@@ -1135,19 +1083,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1158,35 +1104,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1228,13 +1170,10 @@ 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 \
@@ -1267,38 +1206,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1321,8 +1258,6 @@ 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 \
@@ -1414,19 +1349,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1437,37 +1370,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1509,13 +1436,10 @@ 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 \
@@ -1548,38 +1472,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1602,8 +1524,6 @@ 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 \
@@ -1695,19 +1615,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1718,42 +1636,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1795,31 +1703,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -1847,30 +1739,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1893,8 +1791,6 @@ 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 \
@@ -1986,19 +1882,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2009,42 +1903,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2086,31 +1971,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -2138,30 +2007,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2184,8 +2059,6 @@ 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 \
@@ -2277,19 +2150,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2300,46 +2171,34 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2381,31 +2240,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -2433,30 +2276,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2479,8 +2328,6 @@ 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 \
@@ -2572,19 +2419,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2595,42 +2440,29 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(ACE_ROOT)/ace/ACE.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2672,31 +2504,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -2724,30 +2540,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2770,8 +2592,6 @@ 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 \
@@ -2863,19 +2683,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2886,39 +2704,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2960,13 +2771,10 @@ 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 \
@@ -2999,38 +2807,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3053,8 +2859,6 @@ 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 \
@@ -3146,19 +2950,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3169,39 +2971,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -3243,13 +3037,10 @@ 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 \
@@ -3282,38 +3073,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3336,8 +3125,6 @@ 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 \
@@ -3429,19 +3216,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3452,40 +3237,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -3527,18 +3305,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -3566,38 +3352,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3620,8 +3398,6 @@ 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 \
@@ -3713,19 +3489,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3736,37 +3510,35 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -3808,18 +3580,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -3847,38 +3627,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3901,8 +3673,6 @@ 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 \
@@ -3994,19 +3764,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4017,39 +3785,36 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -4091,18 +3856,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -4130,38 +3903,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4184,8 +3949,6 @@ 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 \
@@ -4277,19 +4040,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4300,39 +4061,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -4374,18 +4136,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -4413,38 +4183,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4467,8 +4229,6 @@ 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 \
@@ -4560,19 +4320,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4583,38 +4341,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -4656,13 +4409,10 @@ 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 \
@@ -4695,38 +4445,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4749,8 +4497,6 @@ 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 \
@@ -4842,19 +4588,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4865,37 +4609,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -4937,13 +4675,10 @@ 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 \
@@ -4976,38 +4711,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5030,8 +4763,6 @@ 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 \
@@ -5123,19 +4854,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5146,39 +4875,34 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -5220,31 +4944,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5272,30 +4980,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5318,8 +5032,6 @@ 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 \
@@ -5411,19 +5123,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5434,39 +5144,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -5508,31 +5212,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5560,30 +5248,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5606,8 +5300,6 @@ 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 \
@@ -5699,19 +5391,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5722,37 +5412,30 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -5794,13 +5477,10 @@ 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 \
@@ -5833,38 +5513,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5887,8 +5565,6 @@ 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 \
@@ -5980,19 +5656,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6003,35 +5677,29 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -6073,13 +5741,10 @@ 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 \
@@ -6112,38 +5777,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6166,8 +5829,6 @@ 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 \
@@ -6259,19 +5920,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6282,37 +5941,30 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ orbsvcs_export.h CosNamingC.i CosNamingS.h CosNamingS_T.h \
+ CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i
+.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -6354,13 +6006,10 @@ 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 \
@@ -6393,38 +6042,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6447,8 +6094,6 @@ 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 \
@@ -6540,19 +6185,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6563,36 +6206,38 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -6634,13 +6279,10 @@ 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 \
@@ -6673,38 +6315,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6727,8 +6367,6 @@ 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 \
@@ -6820,19 +6458,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6843,39 +6479,39 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -6917,13 +6553,10 @@ 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 \
@@ -6956,38 +6589,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7010,8 +6641,6 @@ 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 \
@@ -7103,19 +6732,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7126,37 +6753,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -7198,13 +6819,10 @@ 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 \
@@ -7237,38 +6855,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7291,8 +6907,6 @@ 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 \
@@ -7384,19 +6998,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7407,35 +7019,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -7477,13 +7085,10 @@ 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 \
@@ -7516,38 +7121,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7570,8 +7173,6 @@ 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 \
@@ -7663,19 +7264,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7686,37 +7285,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -7758,13 +7352,10 @@ 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 \
@@ -7797,38 +7388,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7851,8 +7440,6 @@ 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 \
@@ -7944,19 +7531,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7967,39 +7552,34 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -8041,13 +7621,10 @@ 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 \
@@ -8080,38 +7657,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8134,8 +7709,6 @@ 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 \
@@ -8227,19 +7800,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8250,47 +7821,30 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -8332,13 +7886,10 @@ 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 \
@@ -8371,38 +7922,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8425,8 +7974,6 @@ 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 \
@@ -8518,19 +8065,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8541,51 +8086,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -8627,13 +8152,10 @@ 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 \
@@ -8666,38 +8188,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8720,8 +8240,6 @@ 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 \
@@ -8813,19 +8331,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8836,48 +8352,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -8919,13 +8418,10 @@ 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 \
@@ -8958,38 +8454,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9012,8 +8506,6 @@ 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 \
@@ -9105,19 +8597,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9128,46 +8618,30 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -9209,13 +8683,10 @@ 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 \
@@ -9248,38 +8719,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9302,8 +8771,6 @@ 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 \
@@ -9395,19 +8862,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9418,38 +8883,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -9491,13 +8958,10 @@ 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 \
@@ -9530,38 +8994,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9584,8 +9046,6 @@ 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 \
@@ -9677,19 +9137,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9700,40 +9158,41 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -9775,13 +9234,10 @@ 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 \
@@ -9814,38 +9270,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9868,8 +9322,6 @@ 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 \
@@ -9961,19 +9413,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9984,36 +9434,45 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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,13 +9514,10 @@ 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 \
@@ -10094,38 +9550,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10148,8 +9602,6 @@ 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 \
@@ -10241,19 +9693,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10264,38 +9714,42 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -10337,13 +9791,10 @@ 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 \
@@ -10376,38 +9827,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10430,8 +9879,6 @@ 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 \
@@ -10523,19 +9970,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10546,38 +9991,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -10619,13 +10057,10 @@ 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 \
@@ -10658,38 +10093,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10712,8 +10145,6 @@ 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 \
@@ -10805,19 +10236,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10828,38 +10257,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -10901,13 +10325,10 @@ 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 \
@@ -10940,38 +10361,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10994,8 +10413,6 @@ 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 \
@@ -11087,19 +10504,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -11110,37 +10525,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -11182,13 +10593,10 @@ 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 \
@@ -11221,38 +10629,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -11275,8 +10681,6 @@ 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 \
@@ -11368,19 +10772,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -11391,36 +10793,31 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -11462,13 +10859,10 @@ 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 \
@@ -11501,38 +10895,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -11555,8 +10947,6 @@ 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 \
@@ -11648,19 +11038,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -11671,44 +11059,29 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -11750,13 +11123,10 @@ 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 \
@@ -11789,38 +11159,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -11843,8 +11211,6 @@ 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 \
@@ -11936,19 +11302,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -11959,45 +11323,35 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -12039,13 +11393,10 @@ 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 \
@@ -12078,38 +11429,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -12132,8 +11481,6 @@ 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 \
@@ -12225,19 +11572,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -12248,36 +11593,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
+ 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 \
@@ -12319,13 +11668,10 @@ 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 \
@@ -12358,38 +11704,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -12412,8 +11756,6 @@ 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 \
@@ -12505,19 +11847,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -12528,39 +11868,39 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -12575,102 +11915,95 @@ 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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -12693,8 +12026,6 @@ 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 \
@@ -12786,19 +12117,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -12809,50 +12138,36 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/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.h \
- $(ACE_ROOT)/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -12877,6 +12192,11 @@ 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 \
@@ -12886,17 +12206,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -12905,7 +12214,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -12938,38 +12246,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -12992,8 +12298,6 @@ 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 \
@@ -13061,7 +12365,15 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -13077,19 +12389,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -13100,102 +12410,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/orbsvcs_export.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/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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
+ $(TAO_ROOT)/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 \
@@ -13220,6 +12465,11 @@ 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 \
@@ -13229,17 +12479,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -13248,7 +12487,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -13281,38 +12519,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -13335,8 +12571,6 @@ 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 \
@@ -13404,7 +12638,15 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -13420,19 +12662,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -13443,100 +12683,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/orbsvcs_export.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 \
- $(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 \
- $(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 \
+ 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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
+ $(TAO_ROOT)/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 \
@@ -13561,6 +12733,11 @@ 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 \
@@ -13570,17 +12747,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -13589,7 +12755,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -13622,38 +12787,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -13676,8 +12839,6 @@ 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 \
@@ -13745,7 +12906,15 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -13761,19 +12930,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -13784,95 +12951,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(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 \
- $(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 \
+ $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/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 \
@@ -13914,13 +13019,10 @@ 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 \
@@ -13953,38 +13055,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -14007,8 +13107,6 @@ 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 \
@@ -14076,6 +13174,12 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -14094,19 +13198,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -14117,44 +13219,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -14196,31 +13287,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -14248,30 +13323,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -14294,8 +13375,6 @@ 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 \
@@ -14387,19 +13466,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -14410,77 +13487,52 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Containers.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
+.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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Log_Record.i \
+ $(TAO_ROOT)/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 \
@@ -14505,6 +13557,11 @@ 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 \
@@ -14514,45 +13571,19 @@ ORBSVCS_COMPONENTS:
  $(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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -14580,30 +13611,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -14626,8 +13663,6 @@ 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 \
@@ -14719,19 +13754,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -14742,52 +13775,14 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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 \
@@ -14799,19 +13794,20 @@ ORBSVCS_COMPONENTS:
  $(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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -14853,13 +13849,10 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -14867,8 +13860,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -14905,30 +13896,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -14951,8 +13942,6 @@ 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 \
@@ -15044,19 +14033,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -15067,74 +14054,43 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/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/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 \
@@ -15149,56 +14105,53 @@ 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/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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -15216,40 +14169,37 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -15272,8 +14222,6 @@ 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 \
@@ -15365,19 +14313,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -15388,48 +14334,46 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/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/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 \
@@ -15441,19 +14385,20 @@ ORBSVCS_COMPONENTS:
  $(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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -15495,13 +14440,10 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -15509,8 +14451,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -15547,30 +14487,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -15593,8 +14533,6 @@ 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 \
@@ -15686,19 +14624,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -15709,68 +14645,42 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -15812,18 +14722,25 @@ 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/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 \
@@ -15851,31 +14768,34 @@ 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/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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.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/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.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/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -15883,6 +14803,8 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -15892,21 +14814,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -15998,19 +14912,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -16021,43 +14933,44 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
-.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/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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -16067,8 +14980,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 \
@@ -16081,11 +14992,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 \
@@ -16095,22 +15001,39 @@ ORBSVCS_COMPONENTS:
  $(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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -16138,38 +15061,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -16192,8 +15107,6 @@ 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 \
@@ -16285,19 +15198,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -16308,47 +15219,56 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -16390,13 +15310,10 @@ 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 \
@@ -16429,38 +15346,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -16483,8 +15398,6 @@ 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 \
@@ -16576,19 +15489,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -16599,84 +15510,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
@@ -16690,6 +15549,14 @@ ORBSVCS_COMPONENTS:
  $(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.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 \
@@ -16715,13 +15582,10 @@ 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 \
@@ -16754,38 +15618,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -16808,8 +15670,6 @@ 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 \
@@ -16901,19 +15761,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -16924,46 +15782,26 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
@@ -16977,6 +15815,17 @@ ORBSVCS_COMPONENTS:
  $(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.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 \
@@ -17002,13 +15851,10 @@ 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 \
@@ -17041,38 +15887,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -17095,8 +15939,6 @@ 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 \
@@ -17188,19 +16030,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -17211,46 +16051,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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,13 +16123,10 @@ 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 \
@@ -17331,38 +16159,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -17385,8 +16211,6 @@ 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 \
@@ -17478,19 +16302,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -17501,74 +16323,38 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -17610,13 +16396,10 @@ 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 \
@@ -17649,38 +16432,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -17703,8 +16484,6 @@ 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 \
@@ -17796,19 +16575,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -17819,36 +16596,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -17890,13 +16671,10 @@ 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 \
@@ -17929,38 +16707,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -17983,8 +16759,6 @@ 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 \
@@ -18076,19 +16850,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -18099,43 +16871,36 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -18177,13 +16942,10 @@ 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 \
@@ -18216,38 +16978,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -18270,8 +17030,6 @@ 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 \
@@ -18363,19 +17121,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -18386,99 +17142,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -18520,13 +17217,10 @@ 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 \
@@ -18559,38 +17253,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -18613,8 +17305,6 @@ 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 \
@@ -18706,19 +17396,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -18729,45 +17417,43 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_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 \
+ 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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -18782,59 +17468,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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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/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 \
@@ -18846,325 +17509,56 @@ 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/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)/orbsvcs/orbsvcs/CosTradingS.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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -19187,8 +17581,6 @@ 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 \
@@ -19280,19 +17672,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -19303,39 +17693,45 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -19377,18 +17773,10 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -19421,38 +17809,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -19475,8 +17861,6 @@ 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 \
@@ -19568,19 +17952,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -19591,54 +17973,41 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -19680,13 +18049,10 @@ 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 \
@@ -19719,38 +18085,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -19773,8 +18137,6 @@ 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 \
@@ -19866,19 +18228,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -19889,103 +18249,43 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/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.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -20000,102 +18300,97 @@ 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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -20118,8 +18413,6 @@ 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 \
@@ -20211,19 +18504,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -20234,102 +18525,41 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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.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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -20344,10 +18574,19 @@ 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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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 \
@@ -20356,28 +18595,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/Containers.h \
- $(ACE_ROOT)/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.h \
- $(ACE_ROOT)/ace/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 \
@@ -20389,15 +18615,8 @@ ORBSVCS_COMPONENTS:
  $(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)/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 \
@@ -20410,50 +18629,42 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -20476,8 +18687,6 @@ 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 \
@@ -20489,6 +18698,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -20566,19 +18778,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -20589,91 +18799,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -20688,22 +18847,49 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
+ $(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 \
@@ -20712,77 +18898,46 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -20805,8 +18960,6 @@ 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 \
@@ -20898,19 +19051,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -20921,77 +19072,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -21033,13 +19144,10 @@ 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 \
@@ -21072,38 +19180,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -21126,8 +19232,6 @@ 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 \
@@ -21219,19 +19323,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -21242,89 +19344,41 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -21339,59 +19393,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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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/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 \
@@ -21403,366 +19434,56 @@ 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/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)/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/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/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -21785,8 +19506,6 @@ 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 \
@@ -21878,19 +19597,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -21901,56 +19618,48 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/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.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -21958,107 +19667,104 @@ 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 \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/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/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -22081,8 +19787,6 @@ 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 \
@@ -22174,19 +19878,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -22197,48 +19899,45 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -22253,102 +19952,97 @@ 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/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/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/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -22371,8 +20065,6 @@ 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 \
@@ -22464,19 +20156,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -22487,85 +20177,47 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/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 \
@@ -22573,11 +20225,21 @@ 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 \
  $(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 \
@@ -22591,34 +20253,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,369 +20273,56 @@ 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/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)/orbsvcs/orbsvcs/CosTradingS.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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -23015,8 +20345,6 @@ 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 \
@@ -23108,19 +20436,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -23131,49 +20457,30 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_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/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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
@@ -23188,6 +20495,23 @@ ORBSVCS_COMPONENTS:
  $(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.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 \
@@ -23201,11 +20525,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -23213,13 +20532,10 @@ 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 \
@@ -23252,47 +20568,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/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/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 \
@@ -23306,8 +20617,6 @@ 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 \
@@ -23399,19 +20708,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -23422,37 +20729,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Time_Utilities.h \
- $(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/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 \
@@ -23463,43 +20749,35 @@ ORBSVCS_COMPONENTS:
  $(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
-.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)/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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -23541,13 +20819,10 @@ 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 \
@@ -23580,38 +20855,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -23634,8 +20907,6 @@ 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 \
@@ -23727,19 +20998,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -23750,46 +21019,58 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/Scheduler_Utilities.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 \
@@ -23831,13 +21112,10 @@ 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 \
@@ -23870,38 +21148,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -23924,8 +21200,6 @@ 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 \
@@ -24017,19 +21291,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -24040,46 +21312,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -24121,13 +21384,10 @@ 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 \
@@ -24160,38 +21420,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -24214,8 +21472,6 @@ 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 \
@@ -24307,19 +21563,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -24330,25 +21584,19 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/RtecSchedulerC.h \
  $(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/Scheduler_Factory.i \
+ 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 \
@@ -24359,50 +21607,34 @@ ORBSVCS_COMPONENTS:
  $(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/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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
@@ -24417,6 +21649,11 @@ 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.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 \
@@ -24438,17 +21675,36 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
+ 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 \
@@ -24465,54 +21721,36 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -24535,8 +21773,6 @@ 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 \
@@ -24548,9 +21784,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -24628,19 +21861,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -24651,64 +21882,41 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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)/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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -24750,13 +21958,10 @@ 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 \
@@ -24789,38 +21994,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -24843,8 +22046,6 @@ 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 \
@@ -24936,19 +22137,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -24959,89 +22158,42 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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/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 \
@@ -25083,13 +22235,10 @@ 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 \
@@ -25122,38 +22271,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -25176,8 +22323,6 @@ 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 \
@@ -25269,19 +22414,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -25292,94 +22435,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
@@ -25394,6 +22480,11 @@ 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.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 \
@@ -25415,17 +22506,35 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
+ $(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 \
@@ -25442,54 +22551,36 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -25512,8 +22603,6 @@ 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 \
@@ -25525,9 +22614,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -25605,19 +22691,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -25628,94 +22712,35 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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,6 +22755,11 @@ 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.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 \
@@ -25751,33 +22781,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 \
@@ -25794,296 +22797,20 @@ 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/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 \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
+ 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 \
@@ -26100,54 +22827,36 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -26170,8 +22879,6 @@ 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 \
@@ -26183,9 +22890,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -26263,19 +22967,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -26286,102 +22988,42 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -26423,13 +23065,10 @@ 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 \
@@ -26462,38 +23101,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -26516,8 +23153,6 @@ 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 \
@@ -26609,19 +23244,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -26632,13 +23265,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -26657,16 +23283,18 @@ ORBSVCS_COMPONENTS:
  $(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/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,17 +23302,19 @@ ORBSVCS_COMPONENTS:
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -26694,7 +23324,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -26736,13 +23365,10 @@ 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 \
@@ -26775,38 +23401,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -26829,8 +23453,6 @@ 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 \
@@ -26922,19 +23544,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -26945,13 +23565,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -27033,16 +23646,18 @@ ORBSVCS_COMPONENTS:
  $(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/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 +23677,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 +23699,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 \
@@ -27115,7 +23727,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -27132,38 +23743,36 @@ ORBSVCS_COMPONENTS:
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -27186,8 +23795,6 @@ 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 \
@@ -27279,19 +23886,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -27302,13 +23907,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -27398,23 +23996,24 @@ ORBSVCS_COMPONENTS:
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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,13 +24055,10 @@ 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 \
@@ -27495,38 +24091,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -27549,8 +24143,6 @@ 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 \
@@ -27642,19 +24234,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -27665,13 +24255,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -27683,23 +24266,24 @@ ORBSVCS_COMPONENTS:
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -27741,13 +24325,10 @@ 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 \
@@ -27780,38 +24361,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -27834,8 +24413,6 @@ 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 \
@@ -27927,19 +24504,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -27950,13 +24525,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -28004,16 +24572,18 @@ ORBSVCS_COMPONENTS:
  $(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/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 +24600,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 +24631,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 \
@@ -28096,7 +24663,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -28108,38 +24674,36 @@ ORBSVCS_COMPONENTS:
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -28162,8 +24726,6 @@ 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 \
@@ -28252,19 +24814,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -28275,13 +24835,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -28357,17 +24910,19 @@ ORBSVCS_COMPONENTS:
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -28377,7 +24932,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -28419,13 +24973,10 @@ 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 \
@@ -28458,38 +25009,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -28512,8 +25061,6 @@ 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 \
@@ -28605,19 +25152,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -28628,13 +25173,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -28715,16 +25253,18 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
@@ -28736,7 +25276,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -28778,13 +25317,10 @@ 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 \
@@ -28817,38 +25353,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -28871,8 +25405,6 @@ 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 \
@@ -28964,19 +25496,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -28987,13 +25517,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -29059,17 +25582,19 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Functor.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -29082,7 +25607,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -29124,13 +25648,10 @@ 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 \
@@ -29158,38 +25679,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -29212,8 +25731,6 @@ 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 \
@@ -29305,19 +25822,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -29328,13 +25843,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -29416,19 +25924,20 @@ ORBSVCS_COMPONENTS:
  $(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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -29470,13 +25979,10 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -29484,8 +25990,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29522,30 +26026,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -29568,8 +26072,6 @@ 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 \
@@ -29661,19 +26163,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -29684,13 +26184,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -29732,16 +26225,18 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
@@ -29767,7 +26262,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -29809,13 +26303,10 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -29823,8 +26314,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29861,30 +26350,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -29907,8 +26396,6 @@ 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 \
@@ -29990,19 +26477,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -30013,13 +26498,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -30073,19 +26551,20 @@ ORBSVCS_COMPONENTS:
  $(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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -30127,13 +26606,10 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -30141,8 +26617,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30179,30 +26653,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -30225,8 +26699,6 @@ 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 \
@@ -30318,19 +26790,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -30341,13 +26811,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -30372,17 +26835,19 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Timeprobe.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 +26870,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,13 +26925,10 @@ 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 \
@@ -30491,38 +26952,36 @@ ORBSVCS_COMPONENTS:
  $(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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -30545,8 +27004,6 @@ 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 \
@@ -30638,19 +27095,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -30661,13 +27116,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -30721,22 +27169,37 @@ 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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
+ $(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 \
@@ -30751,24 +27214,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30782,6 +27227,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -30789,18 +27239,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -30828,44 +27286,39 @@ 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/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/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 \
@@ -30879,8 +27332,6 @@ 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 \
@@ -30972,19 +27423,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -30995,61 +27444,70 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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/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/TimeBaseC.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_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -31091,13 +27549,10 @@ 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 \
@@ -31130,38 +27585,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -31184,8 +27637,6 @@ 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 \
@@ -31277,19 +27728,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -31300,26 +27749,19 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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/RtecSchedulerS.h \
+ $(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/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -31330,34 +27772,57 @@ ORBSVCS_COMPONENTS:
  $(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/Runtime_Scheduler.i
-.obj/Scheduler_Utilities.o .obj/Scheduler_Utilities.so .shobj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp \
+ $(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_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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/Scheduler_Utilities.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 \
@@ -31399,18 +27864,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -31438,38 +27911,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -31492,8 +27957,6 @@ 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 \
@@ -31585,19 +28048,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -31608,43 +28069,65 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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 \
+ $(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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -31686,18 +28169,26 @@ 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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -31725,38 +28216,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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -31779,8 +28262,6 @@ 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 \
@@ -31872,19 +28353,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -31895,62 +28374,67 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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/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 \
+ $(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
+.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/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/Map_Manager.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 \
@@ -31965,12 +28449,6 @@ 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 \
@@ -31992,44 +28470,30 @@ ORBSVCS_COMPONENTS:
  $(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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -32041,38 +28505,46 @@ ORBSVCS_COMPONENTS:
  $(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 \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_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/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/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 \
@@ -32095,8 +28567,6 @@ 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 \
@@ -32108,6 +28578,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -32185,19 +28658,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -32208,47 +28679,61 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(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/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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -32290,13 +28775,10 @@ 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 \
@@ -32329,38 +28811,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -32383,8 +28863,6 @@ 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 \
@@ -32476,19 +28954,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -32499,48 +28975,73 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_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/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
-.obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \
- $(ACE_ROOT)/ace/Sched_Params.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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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/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,13 +29083,10 @@ 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 \
@@ -32621,38 +29119,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -32675,8 +29171,6 @@ 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 \
@@ -32768,19 +29262,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -32791,42 +29283,39 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
- Sched/Scheduler_Generic.h Sched/Scheduler.h \
- $(ACE_ROOT)/ace/Map_Manager.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 \
@@ -32841,12 +29330,6 @@ 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 \
@@ -32868,38 +29351,14 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -32916,255 +29375,11 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -33176,69 +29391,36 @@ ORBSVCS_COMPONENTS:
  $(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/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -33261,8 +29443,6 @@ 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 \
@@ -33274,6 +29454,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -33351,19 +29534,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -33374,49 +29555,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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 \
+ $(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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -33458,13 +29630,10 @@ 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 \
@@ -33497,38 +29666,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -33551,8 +29718,6 @@ 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 \
@@ -33644,19 +29809,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -33667,60 +29830,68 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -33762,13 +29933,10 @@ 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 \
@@ -33801,38 +29969,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -33855,8 +30021,6 @@ 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 \
@@ -33948,19 +30112,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -33971,370 +30133,50 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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 \
+ $(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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -34376,13 +30218,10 @@ 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 \
@@ -34415,38 +30254,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -34469,8 +30306,6 @@ 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 \
@@ -34562,19 +30397,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -34585,61 +30418,89 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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_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_SupplierFiltering.h \
+ Event/EC_SupplierFiltering.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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(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)/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 \
@@ -34681,13 +30542,10 @@ 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 \
@@ -34720,38 +30578,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -34774,8 +30630,6 @@ 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 \
@@ -34867,19 +30721,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -34890,62 +30742,39 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
+ $(TAO_ROOT)/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 \
@@ -34960,359 +30789,27 @@ ORBSVCS_COMPONENTS:
  $(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.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-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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -35321,228 +30818,13 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/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-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 \
@@ -35551,53 +30833,12 @@ 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/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_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 \
@@ -35609,59 +30850,36 @@ ORBSVCS_COMPONENTS:
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -35684,8 +30902,6 @@ 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 \
@@ -35777,19 +30993,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -35800,57 +31014,37 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -35892,13 +31086,10 @@ 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 \
@@ -35931,341 +31122,36 @@ 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/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/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Server_Request.i \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -36288,8 +31174,6 @@ 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 \
@@ -36381,19 +31265,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -36404,67 +31286,35 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -36479,600 +31329,47 @@ ORBSVCS_COMPONENTS:
  $(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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/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/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/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_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 \
@@ -37081,53 +31378,12 @@ 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/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_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 \
@@ -37139,59 +31395,36 @@ ORBSVCS_COMPONENTS:
  $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -37214,8 +31447,6 @@ 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 \
@@ -37307,19 +31538,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -37330,58 +31559,48 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -37423,13 +31642,10 @@ 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 \
@@ -37462,38 +31678,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -37516,8 +31730,6 @@ 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 \
@@ -37609,19 +31821,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -37632,34 +31842,87 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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_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_SupplierFiltering.h \
+ Event/EC_SupplierFiltering.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_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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -37673,13 +31936,9 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
@@ -37703,33 +31962,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 \
@@ -37746,258 +31978,27 @@ 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/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 \
+ $(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/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 \
@@ -38005,63 +32006,40 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -38084,8 +32062,6 @@ 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 \
@@ -38097,9 +32073,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -38177,19 +32150,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -38200,43 +32171,80 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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
+.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -38260,11 +32268,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 \
@@ -38274,17 +32277,18 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -38317,38 +32321,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -38371,8 +32373,6 @@ 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 \
@@ -38464,19 +32464,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -38487,44 +32485,71 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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 \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/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 \
@@ -38566,13 +32591,10 @@ 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 \
@@ -38605,38 +32627,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -38659,8 +32679,6 @@ 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 \
@@ -38752,19 +32770,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -38775,43 +32791,78 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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_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/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_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_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -38853,13 +32904,10 @@ 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 \
@@ -38892,38 +32940,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -38946,8 +32992,6 @@ 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 \
@@ -39039,19 +33083,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -39062,44 +33104,76 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.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 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/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 \
+ $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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.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 \
@@ -39109,8 +33183,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 \
@@ -39141,13 +33213,10 @@ 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 \
@@ -39180,38 +33249,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -39234,8 +33301,6 @@ 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 \
@@ -39327,19 +33392,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -39350,45 +33413,45 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 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/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 \
- $(ACE_ROOT)/ace/ACE.h \
+.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/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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.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 \
@@ -39398,8 +33461,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 \
@@ -39430,31 +33491,15 @@ 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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -39482,325 +33527,36 @@ 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/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 \
- $(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/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/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -39823,8 +33579,6 @@ 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 \
@@ -39916,19 +33670,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -39939,374 +33691,38 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Filter.i 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/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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_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/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_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 \
+ $(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/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 \
@@ -40348,37 +33764,15 @@ 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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -40406,331 +33800,36 @@ 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/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/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 \
- $(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/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/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/Sequence_T.h \
- $(TAO_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/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 \
@@ -40753,8 +33852,6 @@ 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 \
@@ -40846,19 +33943,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -40869,61 +33964,55 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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)/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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -40965,13 +34054,10 @@ 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 \
@@ -41004,38 +34090,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -41058,8 +34142,6 @@ 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 \
@@ -41151,19 +34233,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -41174,41 +34254,80 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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
+.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -41250,13 +34369,10 @@ 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 \
@@ -41289,38 +34405,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -41343,8 +34457,6 @@ 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 \
@@ -41436,19 +34548,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -41459,46 +34569,83 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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
+.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
- 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 \
@@ -41540,13 +34687,10 @@ 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 \
@@ -41579,323 +34723,36 @@ 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/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/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Server_Request.i \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -41918,8 +34775,6 @@ 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 \
@@ -42011,19 +34866,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -42034,43 +34887,83 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/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
+.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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
- 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 \
@@ -42112,13 +35005,10 @@ 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 \
@@ -42151,38 +35041,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -42205,8 +35093,6 @@ 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 \
@@ -42298,19 +35184,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -42321,44 +35205,71 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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
+.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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -42400,13 +35311,10 @@ 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 \
@@ -42439,38 +35347,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -42493,8 +35399,6 @@ 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 \
@@ -42586,19 +35490,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -42609,39 +35511,70 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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_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 \
+ $(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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -42683,13 +35616,10 @@ 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 \
@@ -42722,38 +35652,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -42776,8 +35704,6 @@ 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 \
@@ -42869,19 +35795,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -42892,39 +35816,68 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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/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-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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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 \
@@ -42966,13 +35919,10 @@ 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 \
@@ -43005,38 +35955,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -43059,8 +36007,6 @@ 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 \
@@ -43152,19 +36098,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -43175,39 +36119,64 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(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)/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)/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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -43249,13 +36218,10 @@ 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 \
@@ -43288,38 +36254,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -43342,8 +36306,6 @@ 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 \
@@ -43435,19 +36397,17 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -43458,35 +36418,21 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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.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/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/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/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 75622f13e48..32bc0caaa29 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -122,7 +122,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -160,7 +160,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -171,7 +171,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -213,7 +213,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                           oldentry);
       // Something went wrong with the internal structure
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -224,7 +224,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -262,7 +262,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -273,7 +273,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -312,7 +312,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                  entry,
                                  oldname,
                                  oldentry) < 0)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -322,7 +322,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
 {
   CORBA::Object_ptr result = CORBA::Object::_nil ();
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result);
 
   // Get the length of the name.
@@ -398,7 +398,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -442,14 +442,10 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   TAO_Hash_Naming_Context *c_impl = 0;
-
-  // To keep compilers warnings away.
-  ACE_UNUSED_ARG (c_impl);
-
   TAO_Naming_Context *c = 0;
   CosNaming::NamingContext_var result;
   char poa_id[BUFSIZ];
@@ -460,10 +456,10 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_NEW_THROW_EX (c,
                     TAO_Naming_Context,
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result._retn ());
 
-  // Put <c> into the auto pointer temporarily, in case next
+  // Put c_impl into the auto pointer temporarily, in case next
   // allocation fails.
   ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
 
@@ -472,7 +468,7 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
                                              poa_.in (),
                                              poa_id,
                                              this->hash_table_size_),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result._retn ());
 
   // Allocation succeeded, get rid of auto pointer.
@@ -509,7 +505,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   CosNaming::NamingContext_var result =
@@ -546,7 +542,7 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_GUARD_THROW_EX (ACE_Lock,
                         ace_mon,
                         *this->lock_,
-                        CORBA::INTERNAL ());
+                        CORBA::INTERNAL (CORBA::COMPLETED_NO));
     ACE_CHECK;
 
     if (this->context_.current_size () != 0)
@@ -577,14 +573,8 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
   // 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_;
+  if (this->root_ == 0)
+    delete interface_;
 }
 
 void
@@ -598,21 +588,21 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
   bi = CosNaming::BindingIterator::_nil ();
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // 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 ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Number of bindings that will go into the BindingList.
@@ -640,7 +630,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());
+          ACE_THROW (CORBA::NO_MEMORY(CORBA::COMPLETED_NO));
         }
     }
 
@@ -658,7 +648,7 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
       if (bind_iter == 0)
         {
           delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY ());
+          ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         }
 
       ACE_TRY
@@ -723,14 +713,14 @@ TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
   // bindings, we need to allocate an out parameter.)
   ACE_NEW_THROW_EX (binding,
                     CosNaming::Binding,
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
   b = binding;
 
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
   // If there are no more bindings.
   if (hash_iter_->done ())
@@ -741,7 +731,7 @@ TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
       hash_iter_->next (hash_entry);
 
       if (TAO_Hash_Naming_Context::populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+        ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
       hash_iter_->advance ();
       return 1;
@@ -784,13 +774,13 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
   // parameter is allocated in case we fail to obtain the lock.
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
   // Obtain a lock.
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
   // If there are no more bindings...
@@ -811,7 +801,7 @@ 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);
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
           if (hash_iter_->advance () == 0)
             {
@@ -832,7 +822,7 @@ TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_GUARD_THROW_EX (ACE_Lock,
                         ace_mon,
                         *this->lock_,
-                        CORBA::INTERNAL ());
+                        CORBA::INTERNAL (CORBA::COMPLETED_NO));
     ACE_CHECK;
 
     PortableServer::POA_var poa =
@@ -850,11 +840,7 @@ TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_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;
+  delete this;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index d5476f99651..d2f1e0d1829 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -145,14 +145,11 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
           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
+          // Put c_impl into the auto pointer temporarily, in case
           // next allocation fails.
           ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
index 846f5a191ef..0a703a0d43a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
@@ -128,9 +128,6 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::open (LPCTSTR file_name,
 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.
@@ -184,9 +181,7 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
           this->bind ("NameService",
                       c_impl->counter_,
                       c_impl->context_.map ());
-
-          // Everything went successfully.
-          status = 0;
+          return 0;
             }
       ACE_CATCHANY
         {
@@ -195,13 +190,15 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
         }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (-1);
+
+      // Below will never be reached, but the compiler is not smart to
+      // figure it out.  This will keep the warnings away.
+      return -1;
     }
 
   else
     // CASE 2:Recreate all Naming Contexts.
-    status = recreate_all ();
-
-  return status;
+    return recreate_all ();
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index b2cbe4e6b28..3d80a223ede 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -161,7 +161,7 @@ TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -200,7 +200,7 @@ TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n,
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -211,7 +211,7 @@ TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -248,7 +248,7 @@ TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n,
                                           CosNaming::nobject);
       // Something went wrong with the internal structure
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -259,7 +259,7 @@ TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -297,7 +297,7 @@ TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n,
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
@@ -308,7 +308,7 @@ TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -342,7 +342,7 @@ TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n,
                                n[0].kind,
                                nc,
                                CosNaming::ncontext) < 0)
-      ACE_THROW (CORBA::INTERNAL ());
+      ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 }
 
 CORBA::Object_ptr
@@ -353,7 +353,7 @@ TAO_Persistent_Naming_Context::resolve (const CosNaming::Name& n,
   CosNaming::BindingType type;
 
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result);
 
   // Get the length of the name.
@@ -427,7 +427,7 @@ TAO_Persistent_Naming_Context::unbind (const CosNaming::Name& n,
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Get the length of the name.
@@ -468,7 +468,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   TAO_Persistent_Naming_Context *c_impl = 0;
@@ -488,7 +488,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_NEW_THROW_EX (c,
                     TAO_Naming_Context,
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result._retn ());
 
   // Put c into the auto pointer temporarily, in case next
@@ -501,7 +501,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
                                                    poa_.in (),
                                                    poa_id,
                                                    this->hash_table_size_),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (result._retn ());
 
   // Allocation succeeded, get rid of auto pointer.
@@ -549,7 +549,7 @@ TAO_Persistent_Naming_Context::bind_new_context (const CosNaming::Name& n,
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   CosNaming::NamingContext_var result =
@@ -586,7 +586,7 @@ TAO_Persistent_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_GUARD_THROW_EX (ACE_Lock,
                         ace_mon,
                         *this->lock_,
-                        CORBA::INTERNAL ());
+                        CORBA::INTERNAL (CORBA::COMPLETED_NO));
     ACE_CHECK;
 
     if (this->context_.current_size () != 0)
@@ -612,12 +612,7 @@ TAO_Persistent_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
   // 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_;
+  delete interface_;
 }
 
 void
@@ -631,14 +626,14 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   bi = CosNaming::BindingIterator::_nil ();
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Dynamically allocate hash map iterator.
@@ -646,7 +641,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (hash_iter,
                     TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR
                     (*(context_.map ())),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   // Number of bindings that will go into the BindingList.
@@ -674,7 +669,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       if (populate_binding (hash_entry, bl[i]) == 0)
         {
           delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY());
+          ACE_THROW (CORBA::NO_MEMORY(CORBA::COMPLETED_NO));
         }
     }
 
@@ -692,7 +687,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       if (bind_iter == 0)
         {
           delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY ());
+          ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         }
 
       ACE_TRY
@@ -757,7 +752,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
   // bindings, we need to allocate an out parameter.)
   ACE_NEW_THROW_EX (binding,
                     CosNaming::Binding,
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
   b = binding;
@@ -765,7 +760,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
   // If there are no more bindings.
   if (hash_iter_->done ())
@@ -776,7 +771,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
       hash_iter_->next (hash_entry);
 
       if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+        ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
       hash_iter_->advance ();
       return 1;
@@ -819,14 +814,14 @@ TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
   // parameter is allocated in case we fail to obtain the lock.
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
   // Obtain a lock.
   ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
                       *this->lock_,
-                      CORBA::INTERNAL ());
+                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
   // If there are no more bindings...
@@ -847,7 +842,7 @@ TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
           hash_iter_->next (hash_entry);
 
           if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
           if (hash_iter_->advance () == 0)
             {
@@ -868,7 +863,7 @@ TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_GUARD_THROW_EX (ACE_Lock,
                         ace_mon,
                         *this->lock_,
-                        CORBA::INTERNAL ());
+                        CORBA::INTERNAL (CORBA::COMPLETED_NO));
     ACE_CHECK;
 
     PortableServer::POA_var poa =
@@ -886,11 +881,7 @@ TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_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;
+  delete this;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index ec8ae6a5581..bb59682f6a1 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,17 +96,17 @@ 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;
-  ACE_NEW_RETURN (new_set, TAO_PropertySet, 0);
+  TAO_PropertySet<POA_CosPropertyService::PropertySet> *new_set;
+  ACE_NEW_RETURN (new_set, TAO_PropertySet<POA_CosPropertyService::PropertySet>, 0);
 
   // Successful, store this in the products sequence and return.
   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)
 {
-  TAO_PropertySet *new_set = 0;
-  CosPropertyService::PropertySet_ptr propset_ptr = 0;
+  ACE_DEBUG ((LM_DEBUG,
+              "create_constrained_propertyset\n"));
+  TAO_PropertySet<POA_CosPropertyService::PropertySet> *new_set = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySet (allowed_property_types,
+                      TAO_PropertySet<POA_CosPropertyService::PropertySet> (allowed_property_types,
 									    allowed_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 (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;
+  TAO_PropertySet<POA_CosPropertyService::PropertySet> *new_set = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySet (initial_properties,
-                                       ACE_TRY_ENV),
+                      TAO_PropertySet<POA_CosPropertyService::PropertySet> (initial_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 (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,51 +314,54 @@ 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);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  
-  return propsetdef_ptr;
+  TAO_ENDTRY_RETURN (0);
 }
-
 // Makes default sized hash_table_.
 
 TAO_PropertySetDef::TAO_PropertySetDef (void)
@@ -361,42 +372,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<POA_CosPropertyService::PropertySetDef> (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 +477,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 +562,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 +575,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 +594,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 +604,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 +614,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 +624,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 +634,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 +684,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,7 +699,7 @@ 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,
@@ -665,19 +722,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 +746,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 +760,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 +798,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 +865,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 +878,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 +898,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 +911,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,22 +924,28 @@ 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.
 
-TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_set)
+TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet<POA_CosPropertyService::PropertySet> &property_set)
   : iterator_ (property_set.hash_table_)
 {
 }
@@ -883,12 +974,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;
     }
@@ -906,50 +997,31 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
                   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;
 
   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)
+TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet<POA_CosPropertyService::PropertySet> &property_set)
   : iterator_ (property_set.hash_table_)
 {
 }
@@ -968,13 +1040,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;
     }
@@ -995,817 +1067,35 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
                   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;
 
   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>;
@@ -1817,7 +1107,9 @@ template class ACE_Hash_Map_Iterator_Ex<CosProperty_Hash_Key, CosProperty_Hash_V
 template class ACE_Hash_Map_Iterator_Base_Ex<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Hash<CosProperty_Hash_Key>, ACE_Equal_To<CosProperty_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Hash<CosProperty_Hash_Key>, ACE_Equal_To<CosProperty_Hash_Key>, ACE_Null_Mutex>;
-template class TAO_Unbounded_Sequence<TAO_PropertySet*>;
+template class TAO_PropertySet<POA_CosPropertyService::PropertySet>;
+template class TAO_PropertySet<POA_CosPropertyService::PropertySetDef>;
+template class TAO_Unbounded_Sequence<TAO_PropertySet<POA_CosPropertyService::PropertySet>*>;
 template class TAO_Unbounded_Sequence<TAO_PropertySetDef*>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
@@ -1830,6 +1122,8 @@ template class TAO_Unbounded_Sequence<TAO_PropertySetDef*>;
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Hash<CosProperty_Hash_Key>, ACE_Equal_To<CosProperty_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Hash<CosProperty_Hash_Key>, ACE_Equal_To<CosProperty_Hash_Key>, ACE_Null_Mutex>
-#pragma instantiate TAO_Unbounded_Sequence<TAO_PropertySet*>
+#pragma instantiate TAO_PropertySet<POA_CosPropertyService::PropertySet>
+#pragma instantiate TAO_PropertySet<POA_CosPropertyService::PropertySetDef>
+#pragma instantiate TAO_Unbounded_Sequence<TAO_PropertySet<POA_CosPropertyService::PropertySet>*>
 #pragma instantiate TAO_Unbounded_Sequence<TAO_PropertySetDef*>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 7e4c73939e8..11161e3973b 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,199 +85,22 @@ public:
   virtual ~CosProperty_Hash_Value (void);
   // Destructor.
 
-//private:
-  
-  CORBA::Any pvalue_;
+  CORBA::Any_var pvalue_;
   // property value.
 
   CosPropertyService::PropertyModeType pmode_;
   // Property Mode.
 };
 
-class TAO_ORBSVCS_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
-{
-  // = TITLE
-  //    Gives operations for defining, deleting, enumerating and
-  //    checking of properties.
-  //
-  // = DESCRIPTION
-  //     Uses a HashTable to manage the properties.
-public:
-  friend class TAO_PropertyNamesIterator;
-  friend class TAO_PropertiesIterator;
-
-  // = Initialization and termination methods.
-
-  TAO_PropertySet (void);
-  // Default constructor.
-
-  TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CosPropertyService::Properties allowed_properties,
-                   CORBA::Environment &_env);
-  // Init values that the PropertySetFactory will want to specify.
-
-  TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                   CORBA::Environment &_env);
-  // PropertySetFactory needs this constructor.
-
-  TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CORBA::ULong number_of_allowed_propertydefs,
-                   CORBA::Environment &_env);
-  // PropertySetDef's construction needs this.
-
-  virtual ~TAO_PropertySet (void);
-  // Destructor function.
-
-  virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value,
-                                CORBA::Environment &env);
-  // Store the property in the hash after checking for validity of the
-  // property name, duplicate name, type code over writing etc.
-
-  virtual void define_properties (const CosPropertyService::Properties &nproperties,
-                                  CORBA::Environment &env);
-  // Define a sequence of properties at a time.
-
-  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env);
-  // Get the number of properties that are currently defined in the
-  // PropertySet.
-
-  virtual void get_all_property_names (CORBA::ULong how_many,
-                                       CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest,
-                                       CORBA::Environment &env);
-  // Get the names of all the properties that are currently defined in
-  // the property set.
-
-  virtual CORBA::Any *get_property_value (const char *property_name,
-                                          CORBA::Environment &env);
-  // Get the value of the property, given the name.
-
-  virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties,
-                                         CORBA::Environment &env);
-  // Get all names and their property values.
-
-  virtual void get_all_properties (CORBA::ULong how_many,
-                                   CosPropertyService::Properties_out nproperties,
-                                   CosPropertyService::PropertiesIterator_out rest,
-                                   CORBA::Environment &env);
-  // 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.
-
-  virtual void delete_property (const char *property_name,
-                                CORBA::Environment &env);
-  // Delete a property given a name.
-
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                  CORBA::Environment &env);
-  // Delete all the these properties from this property set.
-
-  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env);
-  // Delete everything from this property set.
-
-  virtual CORBA::Boolean is_property_defined (const char *property_name,
-                                              CORBA::Environment &env);
-  // Tell whether this property is defined or no. Forget about the
-  // value.
-
-protected:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_MAP;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          COSPROPERTY_HASH_ENTRY;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_ITERATOR;
-  // Typedefs are useful.
-
-  CORBA::Boolean is_type_allowed (CORBA::TypeCode_ptr type);
-  // Tells whether this type is allowed in this property set or no.
-
-  CORBA::Boolean is_property_allowed (const char *name);
-  // 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_;
-  // 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.
-
-  CosPropertyService::PropertyNames allowed_property_names_;
-  // Stores the property names that are allowed in this property
-  // set. These properties will be defined with *fixed-normal* modes, by default, at
-  // creation.
-  // If this is *not* empty, these properties will be the only
-  // properties that will exist in this property set. Nothing more
-  // 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.
-};
+// forward declarations.
+class TAO_PropertyNamesIterator;
+class TAO_PropertiesIterator;
 
+// Include templates here.
+#include "CosPropertyService_i_T.h"
 
 class TAO_ORBSVCS_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
-                                              public virtual TAO_PropertySet
+                                              public virtual TAO_PropertySet<POA_CosPropertyService::PropertySetDef>
 {
   // = TITLE
   //     This class implements PropertySetDef interface, which is
@@ -416,7 +234,7 @@ public:
   // modes".
 
 private:
-  TAO_Unbounded_Sequence<TAO_PropertySet*> propertyset_products_;
+  TAO_Unbounded_Sequence<TAO_PropertySet<POA_CosPropertyService::PropertySet>*> propertyset_products_;
   // The PropertySet objects new'ed and given to the client. Let us
   // keep track all of them so that we can delete them at the end.
 };
@@ -459,8 +277,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<POA_CosPropertyService::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
@@ -476,7 +348,7 @@ class TAO_ORBSVCS_Export TAO_PropertiesIterator : public virtual PortableServer:
   //     interface with the additional properties.
 public:
   // = Initialization and termination methods.
-  TAO_PropertiesIterator (TAO_PropertySet &property_set);
+  TAO_PropertiesIterator (TAO_PropertySet<POA_CosPropertyService::PropertySet> &property_set);
   // Constructor.
 
   virtual ~TAO_PropertiesIterator (void);
@@ -506,17 +378,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/CosPropertyService_i_T.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp
new file mode 100644
index 00000000000..f2f3a1ae9f2
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp
@@ -0,0 +1,869 @@
+#ifndef TAO_COSPROPERTYSERVICE_I_T_C
+#define TAO_COSPROPERTYSERVICE_I_T_C
+
+// $Id$
+#include "CosPropertyService_i.h"
+
+// Makes default sized hash_table_. All the sequences are set the max
+// length as 0.
+
+template <class IF>
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+TAO_PropertySet<IF>::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.
+template <class IF>
+TAO_PropertySet<IF>::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)
+{
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+}
+// PropertySetFactory needs this constructor. Store all the initial
+// properies with *normal* modes.
+
+template <class IF>
+TAO_PropertySet<IF>::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.
+template <class IF>
+TAO_PropertySet<IF>::~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.
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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.
+template <class IF>
+CORBA::Boolean
+TAO_PropertySet<IF>::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.
+template <class IF>
+CORBA::Boolean
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+CORBA::ULong
+TAO_PropertySet<IF>::get_number_of_properties (CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_UNUSED_ARG (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.
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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"));
+
+  // Allocating storage is a must.
+  ACE_NEW (property_names,
+           CosPropertyService::PropertyNames);
+  
+  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)
+    {
+      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 PropertySet and use that to create
+  // propertyNames Iterator.
+
+  if (num_of_properties > how_many)
+    {
+      TAO_PropertySet<POA_CosPropertyService::PropertySet> *property_set;
+
+      ACE_NEW (property_set, TAO_PropertySet<POA_CosPropertyService::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.
+
+template <class IF>
+CORBA::Any *
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+CORBA::Boolean
+TAO_PropertySet<IF>::get_properties (const CosPropertyService::PropertyNames &property_names,
+                                 CosPropertyService::Properties_out nproperties,
+                                 CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "get_properties\n"));
+
+  // 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);
+  
+  CORBA::Any_ptr any_ptr = 0;
+  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;
+}
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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"));
+
+  // 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);
+    }
+
+  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<POA_CosPropertyService::PropertySet> *prop_set;
+
+      ACE_NEW (prop_set, TAO_PropertySet<POA_CosPropertyService::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.
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+void
+TAO_PropertySet<IF>::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.
+
+template <class IF>
+CORBA::Boolean
+TAO_PropertySet<IF>::delete_all_properties (CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_UNUSED_ARG (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.
+
+template <class IF>
+CORBA::Boolean
+TAO_PropertySet<IF>::is_property_defined (const char *property_name,  CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_UNUSED_ARG (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;
+    }
+}
+
+#endif /* TAO_COSPROPERTYSERVICE_I_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h
new file mode 100644
index 00000000000..60a77036671
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h
@@ -0,0 +1,141 @@
+// $Id$
+
+#ifndef TAO_COSPROPERTYSERVICE_I_T_H
+#define TAO_COSPROPERTYSERVICE_I_T_H
+
+// = Implementation classes for the PropertyService interfaces.
+template <class IF>
+class TAO_ORBSVCS_Export TAO_PropertySet :  public virtual IF
+{
+  // = TITLE
+  //    Gives operations for defining, deleting, enumerating and
+  //    checking of properties.
+  //
+  // = DESCRIPTION
+  //     Uses a HashTable to manage the properties.
+public:
+  friend class TAO_PropertyNamesIterator;
+  friend class TAO_PropertiesIterator;
+
+  // = Initialization and termination methods.
+
+  TAO_PropertySet (void);
+  // Default constructor.
+
+  TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
+                   const CosPropertyService::Properties allowed_properties,
+                   CORBA::Environment &_env);
+  // Init values that the PropertySetFactory will want to specify.
+
+  TAO_PropertySet (const CosPropertyService::Properties initial_properties,
+                   CORBA::Environment &_env);
+  // PropertySetFactory needs this constructor.
+
+  TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
+                   const CORBA::ULong number_of_allowed_propertydefs,
+                   CORBA::Environment &_env);
+  // PropertySetDef's construction needs this.
+
+  virtual ~TAO_PropertySet (void);
+  // Destructor function.
+
+  virtual void define_property (const char *property_name,
+                                const CORBA::Any &property_value,
+                                CORBA::Environment &env);
+  // Store the property in the hash after checking for validity of the
+  // property name, duplicate name, type code over writing etc.
+
+  virtual void define_properties (const CosPropertyService::Properties &nproperties,
+                                  CORBA::Environment &env);
+  // Define a sequence of properties at a time.
+
+  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env);
+  // Get the number of properties that are currently defined in the
+  // PropertySet.
+
+  virtual void get_all_property_names (CORBA::ULong how_many,
+                                       CosPropertyService::PropertyNames_out property_names,
+                                       CosPropertyService::PropertyNamesIterator_out rest,
+                                       CORBA::Environment &env);
+  // Get the names of all the properties that are currently defined in
+  // the property set.
+
+  virtual CORBA::Any *get_property_value (const char *property_name,
+                                          CORBA::Environment &env);
+  // Get the value of the property, given the name.
+
+  virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
+                                         CosPropertyService::Properties_out nproperties,
+                                         CORBA::Environment &env);
+  // Get all names and their property values.
+
+  virtual void get_all_properties (CORBA::ULong how_many,
+                                   CosPropertyService::Properties_out nproperties,
+                                   CosPropertyService::PropertiesIterator_out rest,
+                                   CORBA::Environment &env);
+  // 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.
+
+  virtual void delete_property (const char *property_name,
+                                CORBA::Environment &env);
+  // Delete a property given a name.
+
+  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
+                                  CORBA::Environment &env);
+  // Delete all the these properties from this property set.
+
+  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env);
+  // Delete everything from this property set.
+
+  virtual CORBA::Boolean is_property_defined (const char *property_name,
+                                              CORBA::Environment &env);
+  // Tell whether this property is defined or no. Forget about the
+  // value.
+
+protected:
+  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
+          CosProperty_Hash_Map;
+  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
+          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;
+  // Typedefs are useful.
+
+  CORBA::Boolean is_type_allowed (CORBA::TypeCode_ptr type);
+  // Tells whether this type is allowed in this property set or no.
+
+  CORBA::Boolean is_property_allowed (const char *name);
+  // Tells  whether this property is allowed in this property set or
+  // no.
+
+  // XXX:This public: is a hack to keep the compiler complain about access violation.
+public:
+  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.
+
+  CosPropertyService::PropertyNames allowed_property_names_;
+  // Stores the property names that are allowed in this property
+  // set. These properties will be defined with *fixed-normal* modes, by default, at
+  // creation.
+  // If this is *not* empty, these properties will be the only
+  // properties that will exist in this property set. Nothing more
+  // can be defined.
+};
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "CosPropertyService_i_T.cpp"
+#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("CosPropertyService_i_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* TAO_COSPROPERTYSERVICE_I_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index e900916243e..354b310a288 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -50,15 +50,12 @@ ACE_Config_Scheduler::create (const char * entry_point,
   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]->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)
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/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/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 53af7791ed0..b29d52f34d3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -257,7 +257,7 @@ TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV)
 			     this->time_interval (ACE_TRY_ENV).upper_bound -
 			     this->time_interval (ACE_TRY_ENV).lower_bound,
 			     0),
-		    CORBA::NO_MEMORY ());
+		    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 9242d81009d..cd41f754ecc 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -42,7 +42,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
                     TAO_UTO (this->get_time (),
                              this->inaccuracy (),
                              this->time_displacement_factor ()),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   // Return the global time as a UTO.
 
@@ -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;
 }
 
@@ -74,7 +74,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                     TAO_UTO (time,
                              inaccuracy,
                              tdf),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   return uto->_this ();
 }
@@ -98,7 +98,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
                     TAO_UTO (utc.time,
                              inaccuracy,
                              utc.tdf),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   return uto->_this ();
 }
@@ -115,7 +115,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
   ACE_NEW_THROW_EX (tio,
                     TAO_TIO (lower,
                              upper),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::TIO::_nil ());
   return tio->_this ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index ef145723be2..80b63b25794 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -30,7 +30,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
                                                + ACE_OS::gettimeofday ().usec () * 10),
                              0,
                              0),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
   ACE_DEBUG ((LM_DEBUG,
@@ -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;
 }
 
@@ -74,7 +74,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                     TAO_UTO (time,
                              inaccuracy,
                              tdf),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
   return uto->_this ();
@@ -93,7 +93,7 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
                     TAO_UTO (utc.time,
                              utc.inacclo + utc.inacchi,
                              utc.tdf),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   return uto->_this ();
 }
@@ -110,7 +110,7 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
   ACE_NEW_THROW_EX (tio,
                     TAO_TIO (lower,
                              upper),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (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..d9957753beb 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -169,7 +169,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
 	  ACE_NEW_THROW_EX (tio,
 			    TAO_TIO (uto->time (ACE_TRY_ENV),
 				     this->time (ACE_TRY_ENV)),
-			    CORBA::NO_MEMORY ());
+			    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 	  
 	  ACE_TRY_CHECK;
 	}
@@ -178,7 +178,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
 	  ACE_NEW_THROW_EX (tio,
 			    TAO_TIO (this->time (ACE_TRY_ENV),
 				     uto->time (ACE_TRY_ENV)),
-			    CORBA::NO_MEMORY ());
+			    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 	  
 	  ACE_TRY_CHECK;
 	}
@@ -215,7 +215,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
       ACE_NEW_THROW_EX (tio,
 			TAO_TIO (lower,
 				 upper),
-			CORBA::NO_MEMORY ());
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;      
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
index 6f4dea5f231..6b552ff0e7b 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -34,10 +34,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/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/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index f3f04c54948..448fedf8915 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
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 6f38f462f7a..f0f41ea8ad6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -433,7 +433,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 +689,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 +845,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_);
@@ -974,9 +972,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 +1282,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 +1308,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 +1576,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 +1831,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 +1844,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 +1857,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 +1870,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_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..ab307c394b7 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;
 
@@ -457,19 +457,8 @@ construct_dynamic_prop (const char* name,
 
   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 +471,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
   // *************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index ead8aa6c008..1016704ddce 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
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 66913227fcf..1f29f577efe 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" /D "WIN32" /D "..\..\\ NDEBUG"

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\\ /I" /I "..\..\..\\ /D" /D "WIN32" /D "_WINDOWS" ..\..\\ NDEBUG"

+# 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 /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

+# SUBTRACT BASE CPP /WX /YX

+# ADD CPP /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 /MDd ..\..\\ _DEBUG" /c

+# SUBTRACT CPP /WX /YX

 RSC=rc.exe

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

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

@@ -172,44 +176,188 @@ SOURCE=.\AV\AVStreams_i.cpp
 

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

 

-DEP_CPP_AVSTR=\

+!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=\

+	"..\..\..\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 +371,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 +399,440 @@ 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\any.h"\

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

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

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

-	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

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

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

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

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

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

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

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

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

 	

 

 !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"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_BCU_C=\

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

+NODEP_CPP_CC_LO=\

+	".\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=.\Concurrency\CC_LockSet.cpp

+SOURCE=.\Concurrency\CC_LockSetFactory.cpp

 

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

 

@@ -417,7 +840,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"\

@@ -648,9 +1071,10 @@ 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"\

@@ -669,19 +1093,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 +1107,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 +1117,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 +1132,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 +1173,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 +1262,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 +1306,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 +1330,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"\

@@ -917,13 +1349,6 @@ DEP_CPP_CC_LOC=\
 	".\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"\

@@ -933,8 +1358,6 @@ NODEP_CPP_CC_LOC=\
 	".\CosConcurrencyControlS_T.i"\

 	

 

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

-

 !ENDIF 

 

 # End Source File

@@ -1199,6 +1622,269 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_CONCU=\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1487,20 +2173,7 @@ NODEP_CPP_CONFI=\
 

 !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 +2187,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 +2197,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 +2212,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 +2253,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 +2340,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 +2384,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 +2408,64 @@ 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"\

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

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

 	

-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"\

+NODEP_CPP_CONFI=\

+	".\CosNamingC.h"\

+	".\CosNamingC.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=.\Trader\Constraint_l.cpp

+SOURCE=.\Trader\Constraint_Interpreter.cpp

 

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

 

@@ -1768,7 +2473,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"\

@@ -2004,7 +2709,7 @@ 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"\

@@ -2023,20 +2728,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 +2742,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 +2752,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 +2767,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 +2808,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 +2895,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 +2940,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,12 +2964,14 @@ 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"\

@@ -2265,20 +2979,14 @@ DEP_CPP_CONSTRA=\
 	"..\..\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_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"\

+NODEP_CPP_CONST=\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

 	".\CosTradingS.h"\

@@ -2288,14 +2996,12 @@ NODEP_CPP_CONSTRA=\
 	".\CosTradingS_T.i"\

 	

 

-!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 +3009,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"\

@@ -2536,19 +3242,10 @@ 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"\

@@ -2567,20 +3264,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 +3278,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 +3288,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 +3303,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 +3344,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 +3431,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 +3476,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,12 +3500,14 @@ 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"\

@@ -2816,14 +3522,7 @@ DEP_CPP_CONSTRAIN=\
 	".\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"\

+NODEP_CPP_CONSTR=\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

 	".\CosTradingS.h"\

@@ -2833,62 +3532,12 @@ NODEP_CPP_CONSTRAIN=\
 	".\CosTradingS_T.i"\

 	

 

-!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 +3545,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"\

@@ -3125,8 +3774,13 @@ 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"\

@@ -3134,31 +3788,18 @@ NODEP_CPP_COSCO=\
 	"..\..\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 +3813,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 +3823,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 +3838,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 +3879,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 +3966,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 +4011,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,12 +4035,14 @@ 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"\

@@ -3387,107 +4050,28 @@ DEP_CPP_COSCON=\
 	"..\..\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_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"\

+NODEP_CPP_CONSTRA=\

+	".\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=.\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 +4079,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"\

@@ -3724,8 +4308,23 @@ 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"\

@@ -3733,38 +4332,18 @@ NODEP_CPP_COSLI=\
 	"..\..\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 +4357,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 +4367,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 +4382,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 +4423,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 +4510,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 +4555,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,12 +4579,14 @@ 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"\

@@ -3993,39 +4594,38 @@ DEP_CPP_COSLIF=\
 	"..\..\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_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"\

+NODEP_CPP_CONSTRAI=\

+	".\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=.\CosNamingC.cpp

+SOURCE=.\Trader\Constraint_y.cpp

 

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

 

@@ -4033,7 +4633,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"\

@@ -4262,8 +4862,14 @@ 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"\

@@ -4271,31 +4877,18 @@ NODEP_CPP_COSNA=\
 	"..\..\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 +4902,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 +4912,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 +4927,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 +4968,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 +5055,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 +5100,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,12 +5124,14 @@ 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"\

@@ -4524,32 +5139,29 @@ DEP_CPP_COSNAM=\
 	"..\..\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_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"\

+NODEP_CPP_CONSTRAIN=\

+	".\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=.\Property\CosPropertyService_i.cpp

+SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

 

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

 

@@ -4557,78 +5169,292 @@ SOURCE=.\Property\CosPropertyService_i.cpp
 

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

 

-DEP_CPP_COSPR=\

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

+

+DEP_CPP_CONSU=\

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

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_COSPR=\

-	"..\..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

+NODEP_CPP_CONSU=\

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

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

 	

 

-!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

-

-!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=.\CosTradingC.cpp

+SOURCE=.\CosConcurrencyControlC.cpp

 

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

 

@@ -4636,7 +5462,7 @@ SOURCE=.\CosTradingC.cpp
 

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

 

-DEP_CPP_COSTR=\

+DEP_CPP_COSCO=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -4866,7 +5692,7 @@ DEP_CPP_COSTR=\
 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_COSTR=\

+NODEP_CPP_COSCO=\

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

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

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

@@ -4874,91 +5700,18 @@ NODEP_CPP_COSTR=\
 	"..\..\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=.\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

-

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

-

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

-

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

-

-DEP_CPP_COSTRA=\

+DEP_CPP_COSCO=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -4972,6 +5725,8 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -4980,9 +5735,12 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -4992,12 +5750,18 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -5027,6 +5791,9 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -5111,32 +5878,39 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -5148,12 +5922,10 @@ DEP_CPP_COSTRA=\
 	"..\..\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"\

@@ -5174,12 +5946,14 @@ DEP_CPP_COSTRA=\
 	"..\..\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"\

@@ -5188,31 +5962,22 @@ DEP_CPP_COSTRA=\
 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_COSTRA=\

-	"..\..\..\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"\

+NODEP_CPP_COSCO=\

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

+SOURCE=.\CosConcurrencyControlS.cpp

 

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

 

@@ -5220,7 +5985,7 @@ SOURCE=.\Event\Dispatching_Modules.cpp
 

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

 

-DEP_CPP_DISPA=\

+DEP_CPP_COSCON=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -5260,8 +6025,6 @@ DEP_CPP_DISPA=\
 	"..\..\..\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"\

@@ -5269,8 +6032,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"\

@@ -5305,15 +6066,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,22 +6130,10 @@ 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"\

@@ -5464,33 +6207,15 @@ DEP_CPP_DISPA=\
 	"..\..\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"\

 	

-NODEP_CPP_DISPA=\

+NODEP_CPP_COSCON=\

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

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

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

@@ -5498,60 +6223,18 @@ NODEP_CPP_DISPA=\
 	"..\..\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"\

+	".\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=.\Sched\DynSched.cpp

-

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

-

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

-

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

-

-DEP_CPP_DYNSC=\

+DEP_CPP_COSCON=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -5565,6 +6248,8 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5573,9 +6258,12 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5585,12 +6273,18 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5620,6 +6314,9 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5635,8 +6332,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,32 +6401,39 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5743,12 +6445,10 @@ DEP_CPP_DYNSC=\
 	"..\..\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"\

@@ -5769,49 +6469,38 @@ DEP_CPP_DYNSC=\
 	"..\..\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"\

-	".\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\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"\

+NODEP_CPP_COSCON=\

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

+SOURCE=.\CosEventChannelAdminC.cpp

 

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

 

@@ -5819,20 +6508,20 @@ SOURCE=.\Event\EC_Basic_Factory.cpp
 

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

 

-DEP_CPP_EC_BA=\

+!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\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 +6581,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 +6605,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 +6686,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 +6700,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 +6725,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 +6749,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 +6756,34 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSEV=\

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

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Filter_Builder.cpp

+SOURCE=.\CosEventChannelAdminS.cpp

 

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

 

@@ -6179,29 +6791,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_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"\

@@ -6215,6 +6864,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,101 +6876,197 @@ 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"\

 	".\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

-

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

-

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

-

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

-

-DEP_CPP_EC_BU=\

-	"..\..\..\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"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

+NODEP_CPP_COSEVE=\

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

 	

 

-!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 +7074,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 +7147,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 +7171,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 +7252,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 +7266,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 +7291,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 +7315,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 +7322,27 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSEVEN=\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Default_Factory.cpp

+SOURCE=.\CosEventCommS.cpp

 

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

 

@@ -6674,21 +7350,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 +7423,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 +7447,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 +7528,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 +7542,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 +7567,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 +7591,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 +7598,27 @@ 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"\

 	".\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"\

+NODEP_CPP_COSEVENT=\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.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 +7626,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 +7645,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 +7686,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 +7722,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 +7751,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 +7770,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 +7779,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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

 	

 

 !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 +7953,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 +7977,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 +8058,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 +8072,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 +8097,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 +8121,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 +8128,34 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSLI=\

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

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Factory.cpp

+SOURCE=.\CosLifeCycleS.cpp

 

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

 

@@ -7578,20 +8163,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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

+	

+

+!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 +8490,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 +8514,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 +8595,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 +8609,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 +8634,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 +8658,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,69 +8665,34 @@ 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"\

 	".\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

-

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

-

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

-

-!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"\

+NODEP_CPP_COSLIF=\

+	".\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_Gateway.cpp

+SOURCE=.\CosNamingC.cpp

 

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

 

@@ -7928,7 +8700,7 @@ SOURCE=.\Event\EC_Gateway.cpp
 

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

 

-DEP_CPP_EC_GA=\

+DEP_CPP_COSNA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -8156,18 +8928,9 @@ 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"\

 	".\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"\

@@ -8175,34 +8938,284 @@ NODEP_CPP_EC_GA=\
 	"..\..\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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSNA=\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Gateway_UDP.cpp

+SOURCE=.\CosNamingS.cpp

 

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

 

@@ -8210,7 +9223,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 +9326,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"\

@@ -8444,15 +9451,9 @@ 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"\

@@ -8460,65 +9461,29 @@ NODEP_CPP_EC_GAT=\
 	"..\..\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 +9543,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 +9567,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 +9648,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 +9662,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 +9687,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 +9711,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 +9718,27 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSNAM=\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Null_Scheduling.cpp

+SOURCE=.\Property\CosPropertyService_i.cpp

 

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

 

@@ -8863,41 +9746,14 @@ 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"\

-	

-

 !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_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"\

@@ -8963,14 +9819,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 +9843,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 +9924,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 +9938,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 +9963,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 +9987,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 +9994,28 @@ 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"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

+	".\Property\CosPropertyService_i.h"\

+	

+NODEP_CPP_COSPR=\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

 	

-

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

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Per_Supplier_Filter.cpp

+SOURCE=.\CosPropertyServiceC.cpp

 

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

 

@@ -9226,20 +10023,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_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"\

@@ -9299,14 +10096,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 +10120,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 +10201,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 +10215,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 +10240,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 +10264,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 +10271,27 @@ 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"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-

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

+NODEP_CPP_COSPRO=\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Priority_Dispatching.cpp

+SOURCE=.\CosPropertyServiceS.cpp

 

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

 

@@ -9563,20 +10299,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_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"\

@@ -9636,14 +10372,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 +10396,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 +10477,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 +10491,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 +10516,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 +10540,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 +10547,27 @@ 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"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-

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

+NODEP_CPP_COSPROP=\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Priority_Scheduling.cpp

+SOURCE=.\CosTradingC.cpp

 

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

 

@@ -9886,50 +10575,267 @@ 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"\

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

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

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

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

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

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

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

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

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

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

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

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

 	

 

 !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_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"\

@@ -9989,14 +10895,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 +10919,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 +11000,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 +11014,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 +11039,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 +11063,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 +11070,27 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSTR=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp

+SOURCE=.\CosTradingS.cpp

 

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

 

@@ -10234,24 +11098,20 @@ SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp
 

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

 

-DEP_CPP_EC_PROX=\

+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"\

-	"..\..\..\ace\CDR_Stream.i"\

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

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

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

@@ -10260,12 +11120,9 @@ DEP_CPP_EC_PROX=\
 	"..\..\..\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"\

@@ -10275,18 +11132,12 @@ DEP_CPP_EC_PROX=\
 	"..\..\..\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"\

@@ -10307,23 +11158,15 @@ 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"\

 	"..\..\..\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"\

@@ -10336,11 +11179,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"\

@@ -10413,159 +11251,114 @@ DEP_CPP_EC_PROX=\
 	"..\..\..\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\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"\

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

 	"..\..\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\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"\

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

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

-	"..\..\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_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"\

 	".\orbsvcs_export.h"\

 	

+NODEP_CPP_COSTRA=\

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

+	

 

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

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxySupplier.cpp

-

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

-

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

-

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

-

-DEP_CPP_EC_PROXY=\

+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"\

@@ -10625,14 +11418,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 +11442,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 +11523,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 +11537,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 +11562,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 +11586,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 +11593,27 @@ 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"\

 	".\orbsvcs_export.h"\

 	

-

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

+NODEP_CPP_COSTRA=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_QOS_Info.cpp

+SOURCE=.\Event\Dispatching_Modules.cpp

 

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

 

@@ -10872,40 +11621,336 @@ 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_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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

+	

+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=.\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_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"\

@@ -10945,6 +11990,8 @@ DEP_CPP_EC_RE=\
 	"..\..\..\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"\

@@ -10952,6 +11999,8 @@ DEP_CPP_EC_RE=\
 	"..\..\..\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"\

@@ -10965,14 +12014,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,14 +12038,20 @@ 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\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"\

@@ -11063,10 +12113,22 @@ DEP_CPP_EC_RE=\
 	"..\..\..\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"\

@@ -11080,16 +12142,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 +12156,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 +12181,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,44 +12205,79 @@ 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"\

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

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

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_DISPA=\

+	".\CosNamingC.h"\

+	".\CosNamingC.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=.\Event\EC_Sched_Filter.cpp

+SOURCE=.\Sched\DynSched.cpp

 

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

 

@@ -11208,44 +12285,273 @@ 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_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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

 	

 

 !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_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"\

@@ -11305,14 +12611,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,14 +12635,11 @@ 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"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -11420,16 +12718,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 +12732,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 +12757,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 +12781,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,41 +12788,37 @@ 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"\

 	".\orbsvcs_export.h"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

 	".\Time_Utilities.h"\

 	".\Time_Utilities.i"\

 	

+NODEP_CPP_DYNSC=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!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"

 

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

 

@@ -11555,7 +12827,7 @@ DEP_CPP_EC_SCH=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Scheduling_Strategy.cpp

+SOURCE=.\Event\EC_Basic_Filter_Builder.cpp

 

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

 

@@ -11563,12 +12835,20 @@ 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"\

-	

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Event\EC_Busy_Lock.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

 

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

 

@@ -11577,7 +12857,7 @@ DEP_CPP_EC_SCHE=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp

+SOURCE=.\Event\EC_Conjunction_Filter.cpp

 

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

 

@@ -11585,10 +12865,20 @@ SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp
 

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

 

-DEP_CPP_EC_SU=\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.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"

 

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

 

@@ -11597,7 +12887,82 @@ DEP_CPP_EC_SU=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_SupplierAdmin.cpp

+SOURCE=.\Event\EC_Disjunction_Filter.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\EC_Dispatching.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\EC_Event_Channel.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\EC_Factory.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\EC_Filter.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\EC_Filter_Builder.cpp

 

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

 

@@ -11605,24 +12970,35 @@ SOURCE=.\Event\EC_SupplierAdmin.cpp
 

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

 

-DEP_CPP_EC_SUP=\

+!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=\

 	"..\..\..\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"\

-	"..\..\..\ace\CDR_Stream.i"\

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

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

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

@@ -11631,12 +13007,9 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\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"\

@@ -11646,18 +13019,12 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\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"\

@@ -11678,23 +13045,15 @@ 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"\

 	"..\..\..\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"\

@@ -11707,11 +13066,6 @@ 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\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -11784,179 +13138,134 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\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\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"\

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

 	"..\..\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\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"\

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

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

-	"..\..\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"\

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

 	

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierFiltering.cpp

-

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

-

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

-

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

-

-DEP_CPP_EC_SUPP=\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

+NODEP_CPP_EC_GA=\

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

 	

 

 !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_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"\

@@ -12016,14 +13325,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,11 +13349,6 @@ 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"\

@@ -12131,16 +13430,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 +13444,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 +13469,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 +13493,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 +13500,57 @@ 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"\

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

 	

-

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

+NODEP_CPP_EC_GA=\

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

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Timeout_Generator.cpp

+SOURCE=.\Event\EC_Gateway_UDP.cpp

 

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

 

@@ -12266,10 +13558,18 @@ SOURCE=.\Event\EC_Timeout_Generator.cpp
 

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

 

-DEP_CPP_EC_TIM=\

+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"\

@@ -12277,18 +13577,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 +13618,240 @@ 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_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_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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

+	

 

 !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_GAT=\

 	"..\..\..\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 +13911,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 +13935,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"\

@@ -12489,8 +13957,14 @@ DEP_CPP_EC_TR=\
 	"..\..\..\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"\

@@ -12548,16 +14022,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 +14036,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 +14061,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 +14085,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,43 +14092,69 @@ 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"\

+	".\Event\EC_Gateway_UDP.h"\

+	".\Event\EC_Gateway_UDP.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

 	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_GAT=\

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

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

 	

 

+!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"

+

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

 

 !ENDIF 

@@ -12684,7 +14162,7 @@ DEP_CPP_EC_TR=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Type_Filter.cpp

+SOURCE=.\Event\EC_ObserverStrategy.cpp

 

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

 

@@ -12692,12 +14170,20 @@ 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"\

-	

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Event\EC_Per_Supplier_Filter.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

 

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

 

@@ -12706,7 +14192,7 @@ DEP_CPP_EC_TY=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_UDP_Admin.cpp

+SOURCE=.\Event\EC_ProxyConsumer.cpp

 

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

 

@@ -12714,35 +14200,20 @@ SOURCE=.\Event\EC_UDP_Admin.cpp
 

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

 

-DEP_CPP_EC_UD=\

-	"..\..\..\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"\

-	".\Event\EC_UDP_Admin.h"\

-	".\orbsvcs_export.h"\

-	

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

 

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

 

@@ -12751,7 +14222,67 @@ DEP_CPP_EC_UD=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\AV\Endpoint_Strategy.cpp

+SOURCE=.\Event\EC_ProxySupplier.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\EC_QOS_Info.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\EC_Reactive_Timeout_Generator.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\EC_SupplierAdmin.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\EC_SupplierFiltering.cpp

 

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

 

@@ -12759,10 +14290,80 @@ SOURCE=.\AV\Endpoint_Strategy.cpp
 

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

 

-DEP_CPP_ENDPO=\

+!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"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Event\EC_Timeout_Generator.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\EC_Type_Filter.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\EC_UDP_Admin.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_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 +14373,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 +14404,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 +14423,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 +14435,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,79 +14454,193 @@ 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"\

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

+NODEP_CPP_EC_UD=\

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

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

 	

 

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\AV\Endpoint_Strategy.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

+

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

 

 !ENDIF 

@@ -13165,6 +14901,263 @@ 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"\

+	".\Naming\Entries.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_ENTRI=\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -13501,6 +15494,344 @@ NODEP_CPP_EVENT=\
 

 !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"\

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

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EVENT=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -13514,12 +15845,267 @@ 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"\

 	".\Event\Event_Manip.h"\

 	".\Event\Event_Manip.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EVENT_=\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

 	

-

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

 

 !ENDIF 

 

@@ -13789,6 +16375,273 @@ NODEP_CPP_EVENT_U=\
 

 !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"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EVENT_U=\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -13802,41 +16655,321 @@ 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"\

+	".\orbsvcs_export.h"\

 	

+NODEP_CPP_EVENTC=\

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

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

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Naming\Hash_Naming_Context.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

 

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

 

@@ -13845,7 +16978,7 @@ DEP_CPP_EVENTC=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Hash_Naming_Context.cpp

+SOURCE=.\ImplRepoC.cpp

 

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

 

@@ -13853,17 +16986,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 +17059,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 +17083,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 +17164,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 +17178,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 +17203,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 +17227,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 +17234,28 @@ 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"\

+	".\orbsvcs_export.h"\

 	

-NODEP_CPP_HASH_=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+NODEP_CPP_IMPLR=\

+	".\ImplRepoC.h"\

+	".\ImplRepoC.i"\

+	".\ImplRepoS.h"\

+	".\ImplRepoS.i"\

+	".\ImplRepoS_T.cpp"\

+	".\ImplRepoS_T.h"\

+	".\ImplRepoS_T.i"\

+	".\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 +17271,274 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_IMPLRE=\

+	".\ImplRepoC.h"\

+	".\ImplRepoC.i"\

+	".\ImplRepoS.h"\

+	".\ImplRepoS.i"\

+	".\ImplRepoS_T.cpp"\

+	".\ImplRepoS_T.h"\

+	".\ImplRepoS_T.i"\

+	".\PingC.h"\

+	".\PingC.i"\

+	".\PingS.h"\

+	".\PingS.i"\

+	".\PingS_T.cpp"\

+	".\PingS_T.h"\

+	".\PingS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -14443,6 +17799,263 @@ NODEP_CPP_IOR_M=\
 

 !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

@@ -14719,6 +18332,281 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LIFEC=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -14995,6 +18883,281 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LIFECY=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -15285,6 +19448,295 @@ NODEP_CPP_LOCAL=\
 

 !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"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_LOCAL=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -15548,6 +20000,268 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGE=\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -15810,6 +20524,267 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGER=\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -16072,6 +21047,267 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGERS=\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -16399,6 +21635,337 @@ NODEP_CPP_MEMOR=\
 

 !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"\

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

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_MEMOR=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -16725,6 +22292,336 @@ NODEP_CPP_MODUL=\
 

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

 

+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"\

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

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_MODUL=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -16738,10 +22635,6 @@ SOURCE=.\Naming\Naming_Context.cpp
 

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

 

-DEP_CPP_NAMIN=\

-	".\Naming\Naming_Context.h"\

-	

-

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

 

 !ENDIF 

@@ -16757,7 +22650,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"\

@@ -16995,7 +22888,7 @@ DEP_CPP_NAMING=\
 	".\Naming\Naming_Utils.h"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_NAMING=\

+NODEP_CPP_NAMIN=\

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

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

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

@@ -17015,6 +22908,276 @@ NODEP_CPP_NAMING=\
 

 !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"\

+	".\IOR_Multicast.h"\

+	".\Naming\Entries.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_NAMIN=\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\Naming\CosNaming_i.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -17310,33 +23473,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 +23544,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 +23568,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 +23649,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 +23663,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 +23688,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 +23712,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,20 +23719,37 @@ 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"\

+	".\orbsvcs_export.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_OFFER=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

+!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"

+

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

 

 !ENDIF 

@@ -17632,20 +23765,65 @@ SOURCE=.\Naming\Persistent_Context_Index.cpp
 

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

 

-DEP_CPP_PERSIS=\

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Naming\Persistent_Entries.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=.\Naming\Persistent_Naming_Context.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=.\PingC.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_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 +23883,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 +23907,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 +23988,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 +24002,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 +24027,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 +24051,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 +24058,27 @@ 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"\

+	

+NODEP_CPP_PINGC=\

+	".\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 +24086,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 +24159,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 +24183,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 +24264,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 +24278,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 +24303,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 +24327,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 +24334,27 @@ 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"\

+	

+NODEP_CPP_PINGS=\

+	".\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 +24362,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 +24435,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 +24459,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 +24540,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 +24554,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 +24579,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 +24603,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 +24610,68 @@ 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"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

-NODEP_CPP_PERSISTE=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+NODEP_CPP_PROXY=\

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

+	".\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=.\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 +24681,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 +24752,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 +24764,216 @@ 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"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-

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

+NODEP_CPP_PROXYP=\

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

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

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

+SOURCE=.\Event\ReactorTask.cpp

 

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

 

@@ -18688,9 +24981,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 +25000,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\any.h"\

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

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

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

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

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

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

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

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

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

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

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

+	".\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=.\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 +25300,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 +25310,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 +25325,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 +25370,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 +25392,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 +25478,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 +25522,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 +25546,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,6 +25554,7 @@ 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"\

@@ -18998,16 +25575,8 @@ DEP_CPP_REACT=\
 	".\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"\

@@ -19038,8 +25607,6 @@ NODEP_CPP_REACT=\
 	".\TimeBaseS_T.i"\

 	

 

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

-

 !ENDIF 

 

 # End Source File

@@ -19372,6 +25939,340 @@ NODEP_CPP_RT_TA=\
 

 !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"\

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

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_RT_TA=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -19655,6 +26556,288 @@ NODEP_CPP_RTECE=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECE=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -19938,6 +27121,288 @@ NODEP_CPP_RTECEV=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEV=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -20207,6 +27672,274 @@ NODEP_CPP_RTECEVE=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEVE=\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -20476,6 +28209,274 @@ NODEP_CPP_RTECEVEN=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEVEN=\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -20745,6 +28746,274 @@ NODEP_CPP_RTECS=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECS=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -21014,6 +29283,274 @@ NODEP_CPP_RTECSC=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECSC=\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -21029,6 +29566,281 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECU=\

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

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21044,6 +29856,281 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECUD=\

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

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21321,6 +30408,282 @@ NODEP_CPP_RUNTI=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_RUNTI=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -21585,6 +30948,269 @@ NODEP_CPP_SCHED=\
 

 !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"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHED=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21851,6 +31477,271 @@ NODEP_CPP_SCHEDU=\
 

 !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"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHEDU=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22126,6 +32017,280 @@ NODEP_CPP_SCHEDUL=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	

+NODEP_CPP_SCHEDUL=\

+	".\CosNamingC.h"\

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

+	

+

 !ENDIF 

 

 # End Source File

@@ -22394,6 +32559,273 @@ NODEP_CPP_SCHEDULE=\
 

 !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"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Sched\Scheduler_Generic.h"\

+	".\Sched\Scheduler_Generic.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHEDULE=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22655,6 +33087,266 @@ NODEP_CPP_SCHEDULER=\
 

 !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"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Utilities.h"\

+	".\Scheduler_Utilities.i"\

+	

+NODEP_CPP_SCHEDULER=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22919,45 +33611,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,37 +33682,210 @@ 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"\

 	".\orbsvcs_export.h"\

+	".\Trader\Service_Type_Repository.h"\

+	".\Trader\Trader.h"\

 	

+NODEP_CPP_SERVI=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!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"

 

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

 

@@ -23308,6 +34189,275 @@ NODEP_CPP_STRAT=\
 

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

 

+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"\

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

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

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

+	

+NODEP_CPP_STRAT=\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -23321,40 +34471,305 @@ SOURCE=.\CosEvent\SupplierAdmin_i.cpp
 

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

 

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

 	".\CosEvent\SupplierAdmin_i.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_SUPPL=\

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

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

 

@@ -23369,20 +34784,20 @@ SOURCE=.\Time\TAO_Time_Service_Clerk.cpp
 

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

 

+!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\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 +34857,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 +34881,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"\

@@ -23561,16 +34966,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 +34980,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 +35005,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,8 +35029,6 @@ 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"\

@@ -23654,15 +35037,11 @@ DEP_CPP_TAO_T=\
 	"..\..\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\Entries.h"\

 	".\Naming\Naming_Utils.h"\

 	".\orbsvcs_export.h"\

 	".\Time\TAO_Time_Service_Clerk.h"\

@@ -23671,11 +35050,30 @@ DEP_CPP_TAO_T=\
 	".\Time\Timer_Helper.h"\

 	

 NODEP_CPP_TAO_T=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\Naming\CosNaming_i.h"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

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

@@ -23689,10 +35087,20 @@ SOURCE=.\Time\TAO_Time_Service_Server.cpp
 

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

 

+!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"\

@@ -23702,12 +35110,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 +35141,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 +35160,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 +35172,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,70 +35191,175 @@ 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_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"\

+	".\orbsvcs_export.h"\

 	".\Time\TAO_Time_Service_Server.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

 	

-

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

+NODEP_CPP_TAO_TI=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

 

 !ENDIF 

 

@@ -23838,10 +35374,20 @@ SOURCE=.\Time\TAO_TIO.cpp
 

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

 

+!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"\

@@ -23851,12 +35397,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 +35428,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 +35447,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 +35459,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,69 +35478,174 @@ 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"\

+	".\orbsvcs_export.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

 	

-

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

+NODEP_CPP_TAO_TIO=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

 

 !ENDIF 

 

@@ -23986,10 +35660,20 @@ SOURCE=.\Time\TAO_UTO.cpp
 

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

 

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

+

 DEP_CPP_TAO_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"\

@@ -23999,12 +35683,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 +35714,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 +35733,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 +35745,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,69 +35764,174 @@ 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"\

+	".\orbsvcs_export.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

 	

-

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

+NODEP_CPP_TAO_U=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

 

 !ENDIF 

 

@@ -24380,6 +36192,264 @@ NODEP_CPP_TIME_=\
 

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

 

+DEP_CPP_TIME_=\

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

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_TIME_=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -24642,6 +36712,267 @@ NODEP_CPP_TIMEB=\
 

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

 

+DEP_CPP_TIMEB=\

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

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMEB=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -24904,6 +37235,267 @@ NODEP_CPP_TIMEBA=\
 

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

 

+DEP_CPP_TIMEBA=\

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

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMEBA=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -24917,20 +37509,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 +37582,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 +37606,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 +37691,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 +37705,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 +37730,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 +37754,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 +37761,41 @@ 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"\

 	".\IOR_Multicast.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"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\Naming\CosNaming_i.h"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\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 +37809,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 +37886,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 +37910,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 +38012,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 +38026,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 +38051,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 +38075,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 +38083,9 @@ 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"\

 	".\Event\Fast_Reactor.h"\

 	".\Event\Local_ESTypes.h"\

 	".\Event\Local_ESTypes.i"\

@@ -25564,11 +38102,38 @@ DEP_CPP_TIMER_=\
 	".\Time_Utilities.i"\

 	

 NODEP_CPP_TIMER_=\

-	".\Event\ace\ReactorEx.h"\

+	".\CosNamingC.h"\

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

@@ -25584,6 +38149,274 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMES=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -25599,6 +38432,274 @@ 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"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMESE=\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -25877,6 +38978,284 @@ 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"\

+	".\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_TRADE=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -26141,6 +39520,269 @@ 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"\

+	".\orbsvcs_export.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_TRADER=\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -26214,10 +39856,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

@@ -26254,30 +39892,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=.\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

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosTradingS.h

 # End Source File

 # Begin Source File

@@ -26314,10 +39928,6 @@ 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

@@ -26326,10 +39936,6 @@ 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

@@ -26358,10 +39964,6 @@ 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

@@ -26370,14 +39972,6 @@ 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

@@ -26398,22 +39992,6 @@ 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

@@ -26430,10 +40008,6 @@ 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

@@ -26754,30 +40328,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=.\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

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosTradingS.i

 # End Source File

 # Begin Source File

@@ -26814,10 +40364,6 @@ 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

@@ -26826,10 +40372,6 @@ 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

@@ -26850,10 +40392,6 @@ 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

@@ -26862,14 +40400,6 @@ 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

@@ -26890,22 +40420,6 @@ 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

@@ -26922,10 +40436,6 @@ 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

@@ -27015,14 +40525,13 @@ 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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27055,14 +40564,13 @@ BuildCmds= \
 !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

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27094,84 +40602,8 @@ BuildCmds= \
 

 !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

@@ -27189,7 +40621,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27229,7 +40661,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27268,8 +40700,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 +40740,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 +40781,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"	

 # 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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27389,14 +40821,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\CosEventChannelAdmin.idl

 InputName=CosEventChannelAdmin

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27429,14 +40861,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 +40901,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 +40948,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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27556,14 +40988,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\CosEventComm.idl

 InputName=CosEventComm

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27596,14 +41028,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 +41068,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)

@@ -27690,7 +41122,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27730,7 +41162,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27769,8 +41201,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 +41241,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)

@@ -27857,7 +41289,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27897,7 +41329,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27936,8 +41368,8 @@ 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)

@@ -27976,8 +41408,8 @@ 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 +41449,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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28057,14 +41489,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28097,14 +41529,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 +41569,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)

@@ -28191,7 +41623,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28231,7 +41663,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28270,8 +41702,8 @@ 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)

@@ -28310,338 +41742,8 @@ 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

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-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

-

-"$(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__COSTRADI="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-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__COSTRADI="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-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=.\CosTradingRepos.idl

-

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

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

-

-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=.\CosTradingRepos.idl

-InputName=CosTradingRepos

-

-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__COSTRADIN="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

-

-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__COSTRADIN="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

-

-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 +41783,14 @@ SOURCE=.\ImplRepo.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__IMPLREP="..\..\..\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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28721,14 +41823,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\ImplRepo.idl

 InputName=ImplRepo

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28761,14 +41863,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,44 +41900,6 @@ BuildCmds= \
 

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

 

-# PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\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

-

-"$(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

@@ -28855,7 +41917,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28895,7 +41957,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28934,8 +41996,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 +42036,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)

@@ -29022,7 +42084,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29062,7 +42124,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29101,8 +42163,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,8 +42203,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

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29182,14 +42244,13 @@ 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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29222,14 +42283,13 @@ BuildCmds= \
 !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

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29261,84 +42321,8 @@ BuildCmds= \
 

 !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

-

-"$(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

@@ -29356,7 +42340,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29396,7 +42380,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29429,40 +42413,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 +42458,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)

@@ -29523,7 +42506,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29563,7 +42546,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29602,8 +42585,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 +42625,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)

@@ -29690,7 +42673,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29730,7 +42713,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29769,8 +42752,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 +42792,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)

@@ -29857,7 +42840,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29897,7 +42880,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -29936,8 +42919,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 +42959,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 +43000,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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30057,14 +43040,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30097,14 +43080,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,14 +43120,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

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30184,14 +43167,13 @@ 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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30224,14 +43206,13 @@ BuildCmds= \
 !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

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30263,84 +43244,8 @@ BuildCmds= \
 

 !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

@@ -30358,7 +43263,7 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30397,10 +43302,8 @@ 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..\..\ 

+	..\..\..\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)

@@ -30439,8 +43342,8 @@ 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

+	..\..\..\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)

@@ -30479,8 +43382,8 @@ 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 +43423,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

+  -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30560,14 +43463,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 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 on $(InputName)

 InputPath=.\TimeService.idl

 InputName=TimeService

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -30600,14 +43503,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 +43543,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)

@@ -30687,21 +43590,6 @@ BuildCmds= \
 # 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"

 

@@ -30716,7 +43604,7 @@ SOURCE=.\CosTradingDynamicS_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingReposS_T.cpp

+SOURCE=.\Property\CosPropertyService_i_T.cpp

 

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

 

@@ -30731,6 +43619,11 @@ SOURCE=.\CosTradingReposS_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\CosPropertyServiceS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosTradingS_T.cpp

 

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

@@ -30756,7 +43649,21 @@ SOURCE=.\CosTradingS_T.cpp
 # Begin Source File

 

 SOURCE=.\AV\Endpoint_Strategy_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"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -30814,12 +43721,40 @@ SOURCE=.\Trader\Offer_Iterators_T.cpp
 # Begin Source File

 

 SOURCE=.\Naming\Persistent_Context_Index_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"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming\Shared_Hash_Map_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"

+

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

+

+!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..4eaf0944457 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 /D TAO_ORBSVCS_HAS_DLL=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 /D TAO_ORBSVCS_HAS_DLL=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

@@ -152,10 +150,6 @@ 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

@@ -204,22 +198,6 @@ SOURCE=.\CosTradingC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.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

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosTradingS.cpp

 # End Source File

 # Begin Source File

@@ -252,10 +230,6 @@ 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

@@ -264,10 +238,6 @@ 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

@@ -296,10 +266,6 @@ 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

@@ -308,14 +274,6 @@ 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

@@ -336,22 +294,6 @@ 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

@@ -368,10 +310,6 @@ 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

@@ -692,10 +630,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

@@ -736,22 +670,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

@@ -796,10 +714,6 @@ 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

@@ -808,10 +722,6 @@ 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

@@ -840,10 +750,6 @@ 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

@@ -852,14 +758,6 @@ 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

@@ -884,22 +782,6 @@ 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

@@ -916,10 +798,6 @@ 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

@@ -1228,22 +1106,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 +1122,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

@@ -1377,15 +1199,12 @@ 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

+	..\..\..\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)

@@ -1418,14 +1237,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -1465,15 +1282,12 @@ 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

 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

+	..\..\..\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)

@@ -1506,14 +1320,12 @@ 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

 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

+	..\..\..\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)

@@ -1553,15 +1365,12 @@ 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

+	..\..\..\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)

@@ -1594,14 +1403,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -1641,15 +1448,12 @@ 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

+	..\..\..\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)

@@ -1682,14 +1486,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -1729,15 +1531,12 @@ 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

 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

+	..\..\..\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)

@@ -1770,14 +1569,12 @@ 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

 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

+	..\..\..\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)

@@ -1817,15 +1614,12 @@ 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

 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

+	..\..\..\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)

@@ -1858,14 +1652,12 @@ 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

 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

+	..\..\..\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)

@@ -1905,15 +1697,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

 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

+	..\..\..\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)

@@ -1946,14 +1735,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

 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

+	..\..\..\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)

@@ -1993,15 +1780,12 @@ 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

+	..\..\..\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)

@@ -2034,188 +1818,12 @@ BuildCmds= \
 !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

-

-"$(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=.\CosTradingRepos.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

-

-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=.\CosTradingRepos.idl

-InputName=CosTradingRepos

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\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)

@@ -2255,15 +1863,12 @@ SOURCE=.\ImplRepo.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

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\..\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)

@@ -2296,14 +1901,12 @@ 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

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\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)

@@ -2343,15 +1946,12 @@ 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

 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

+	..\..\..\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)

@@ -2384,14 +1984,12 @@ 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

 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

+	..\..\..\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)

@@ -2431,15 +2029,12 @@ 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

 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

+	..\..\..\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)

@@ -2472,14 +2067,12 @@ 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

 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

+	..\..\..\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)

@@ -2519,15 +2112,12 @@ 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

+	..\..\..\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)

@@ -2560,14 +2150,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -2607,15 +2195,12 @@ 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

+	..\..\..\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)

@@ -2648,14 +2233,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -2695,15 +2278,12 @@ 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

 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

+	..\..\..\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)

@@ -2736,14 +2316,12 @@ 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

 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

+	..\..\..\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)

@@ -2783,15 +2361,12 @@ 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

 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

+	..\..\..\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)

@@ -2824,14 +2399,12 @@ 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

 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

+	..\..\..\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)

@@ -2871,15 +2444,12 @@ 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

 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

+	..\..\..\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)

@@ -2912,14 +2482,12 @@ 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

 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

+	..\..\..\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)

@@ -2959,15 +2527,12 @@ 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

+	..\..\..\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)

@@ -3000,14 +2565,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -3047,15 +2610,12 @@ SOURCE=.\sfp.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

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\..\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)

@@ -3088,14 +2648,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

@@ -3135,15 +2693,12 @@ 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

+	..\..\..\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)

@@ -3176,14 +2731,12 @@ BuildCmds= \
 !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

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\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)

@@ -3223,15 +2776,12 @@ 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

+	..\..\..\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)

@@ -3264,14 +2814,12 @@ BuildCmds= \
 !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

+	..\..\..\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)

diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index 9a378719a9b..13164e1a25b 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -47,9 +47,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; 
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/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index 14ec4ce5e14..0911b34a1a1 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -25,20 +25,20 @@ FILES = client server child child_process
 DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
 
-BIN2 = server client child_process
+
+#----------------------------------------------------------------------------
+#	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)))
-  BIN = $(BIN2)
+  BIN = server client child_process
 endif # AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -60,1475 +60,13 @@ client:$(addprefix $(VDIR),$(CLIENT_OBJS))
 child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_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.
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.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/streams.h \
- $(ACE_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 \
- $(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 \
- $(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 \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/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 \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_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/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(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 \
- $(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)/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 \
- $(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/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/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/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 \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_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/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(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 \
- $(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)/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 \
- $(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/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/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/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 \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_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/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
- $(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 \
- $(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)/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 \
- $(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
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
index 924c1046a04..7bb9e034a28 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
@@ -73,20 +73,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 ()),
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp
index 0470a59e528..eb4444115f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp
@@ -13,11 +13,3 @@ main (int argc, char **argv)
 
    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..5a169472c6b 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -103,11 +103,11 @@ 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,
@@ -141,13 +141,12 @@ ttcp_Client_StreamEndPoint::open (void *)
 }
 
 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)
-
+  : reactive_strategy_ (&orb_manager_),
+    ttcp_reactive_strategy_ (&orb_manager_,this),
+    client_mmdevice_ (0),
+    argc_ (argc),
+    argv_ (argv),
+    task_id_ (task_id)
 {
 }
 
@@ -333,7 +332,13 @@ Client::svc (void)
       timer.start ();
       for (int i=0;i<number;i++)
 	{
-          this->stream_.send_n (buffer,buffer_siz);
+	  cerr << i << " ";
+	  if (i == 136)
+	    {
+	      	  this->stream_.send_n (buffer,buffer_siz);
+	    }
+	  else
+	    this->stream_.send_n (buffer,buffer_siz);
 	}
       timer.stop ();
       timer.elapsed_time (tv2);
@@ -467,8 +472,7 @@ main (int argc, char **argv)
 
   GLOBALS::instance ()->thread_count_ = 1;
   // Preliminary argument processing.
-  int i;
-  for (i=0;i< argc;i++)
+  for (int i=0;i< argc;i++)
     {
       if (ACE_OS::strcmp (argv[i],"-t") == 0
           && (i - 1 < argc))
@@ -504,8 +508,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 +516,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..cc7f4546ff3 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
@@ -162,7 +162,7 @@ public:
   // No. of threads.
 };
 
-typedef ACE_Singleton <Globals,ACE_SYNCH_MUTEX> GLOBALS;
+typedef ACE_Singleton <Globals,ACE_Thread_Mutex> GLOBALS;
 
 class Client : public ACE_Task<ACE_SYNCH>
 // one of these per client thread
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
index fe09c7a6f3c..9cf02c946d4 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"
 
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..71bb0df21ac 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -116,8 +116,7 @@ ACE_RCSID(benchmark, server, "$Id$")
 //------------------------------------------------------------
 Server::Server (void)
   :process_strategy_ (&process_options_),
-   reactive_strategy_(&orb_manager_),
-   mmdevice_ (0)
+   reactive_strategy_(&orb_manager_)
 {
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
index 52fbde787d4..6db660c8d11 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
@@ -1,5 +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.
+#
+#   -ORBsystemidpolicydemuxstrategy <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
+#
 static 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"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
index f7a4dea4ec8..72cfcad51b8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
@@ -10,7 +10,7 @@ endif
 
 # 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))
@@ -19,20 +19,20 @@ LIBS 	+= -lTAO -lACE -lorbsvcs
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT)
 
-BIN2 = vcr
+
+#----------------------------------------------------------------------------
+#	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)))
-  BIN = $(BIN2)
+  BIN = vcr
 endif # AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -48,8 +48,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.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
index a5a704c4cdc..b8f56f76e54 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$
 #
+# 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.
+#
+#   -ORBsystemidpolicydemuxstrategy <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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
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..bc7bfe20e15 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
@@ -36,7 +36,7 @@ Command_Handler::Command_Handler (ACE_HANDLE command_handle)
 
 Command_Handler::~Command_Handler (void)
 {
-  //  this->remove_handlers ();
+  this->remove_handlers ();
   if (ACE_OS::getpid () == CTRpid)
     ::remove_all_semaphores ();
 }
@@ -462,6 +462,7 @@ Command_Handler::init_av (void)
 
   if (af[0] != 0)
     {
+      int result;
       if ((result =init_audio_channel(af)) > 0)
         return result;
       else if (result < 0)
@@ -485,7 +486,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)
+      if (this->init_video_channel(vf) > 0)
         return result;
       else if (result < 0)
         {
@@ -524,14 +525,6 @@ 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;
     }
   cerr << "returning from init_av \n";
   return 0;
@@ -605,10 +598,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 +619,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;
@@ -793,7 +781,7 @@ Command_Handler::init_audio_channel (char *audiofile)
 #endif
                 }
                 abuffer->ABprocess(this->audio_data_handle_);
-                //                this->remove_handlers ();
+                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 ();
@@ -815,7 +803,16 @@ Command_Handler::init_audio_channel (char *audiofile)
 int
 Command_Handler::remove_handlers (void)
 {
+  int result;
+  result = this->client_sig_handler_.remove_handler ();
+  
+  if (TAO_ORB_Core_instance ()->reactor ()->remove_handler (&this->notification_handler_,
+                                                              ACE_Event_Handler::READ_MASK) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%P|%t) remove_handler for notification handler failed\n"),
+                      -1);
   return 0;
+  
 }
 
 void
@@ -1064,7 +1061,7 @@ Command_Handler::init_video_channel (char *videofile)
                 }
               else
                 {
-                  //                  this->remove_handlers ();
+                  this->remove_handlers ();
                   this->orb_manager_.orb ()->shutdown ();
                   return 1;
                 }
@@ -1127,7 +1124,7 @@ 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"));
+                fprintf (stderr,"(%P|%t) Command process read a garbage bytes\n");
                 ::close(sp[0]);
                 ACE_OS::free (buf);
               }
@@ -2142,7 +2139,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);
 }
@@ -2190,10 +2187,10 @@ 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"));
+    ACE_DEBUG ((LM_DEBUG,"(%P)remove_handler failed for client_sig handler"));
 
   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"));
+    ACE_DEBUG ((LM_DEBUG,"(%P)remove_handler failed for client_sig handler"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
index 4fadaab1df6..800a8a63e47 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,21 +55,20 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 ##LIBS 	+= -lTAO -lACE
 
+#----------------------------------------------------------------------------
+#	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)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else  # ! AV
+ifneq (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BUILD =
   override INSTALL =
 endif # ! AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -85,12 +84,943 @@ 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 \
+ $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/2x2.o .obj/2x2.so .shobj/2x2.o .shobj/2x2.so: 2x2.cpp video.h dither.h proto.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/ab.o .obj/ab.so .shobj/ab.o .shobj/ab.so: ab.cpp ab.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.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 \
+ $(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 vb.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-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 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 \
+ $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i 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-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 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 \
+ $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i proto.h
+.obj/fs2fast.o .obj/fs2fast.so .shobj/fs2fast.o .shobj/fs2fast.so: fs2fast.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/fs4.o .obj/fs4.so .shobj/fs4.o .shobj/fs4.so: fs4.cpp fs4.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i 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-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/gray.o .obj/gray.so .shobj/gray.o .shobj/gray.so: gray.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/hybrid.o .obj/hybrid.so .shobj/hybrid.o .shobj/hybrid.so: hybrid.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/hybriderr.o .obj/hybriderr.so .shobj/hybriderr.o .shobj/hybriderr.so: hybriderr.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/info.o .obj/info.so .shobj/info.o .shobj/info.so: info.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-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
+.obj/jrevdct.o .obj/jrevdct.so .shobj/jrevdct.o .shobj/jrevdct.so: jrevdct.cpp video.h proto.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.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 \
+ $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/mono.o .obj/mono.so .shobj/mono.o .shobj/mono.so: mono.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/motionvector.o .obj/motionvector.so .shobj/motionvector.o .shobj/motionvector.so: motionvector.cpp video.h proto.h util.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/ordered.o .obj/ordered.so .shobj/ordered.o .shobj/ordered.so: ordered.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/ordered2.o .obj/ordered2.so .shobj/ordered2.o .shobj/ordered2.so: ordered2.cpp video.h proto.h dither.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.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-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 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-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/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-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 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-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 \
+ 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 \
+ $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/util32.o .obj/util32.so .shobj/util32.o .shobj/util32.so: util32.cpp video.h proto.h ui.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/vb.o .obj/vb.so .shobj/vb.o .shobj/vb.so: vb.cpp vb.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.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 \
+ $(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
+.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-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 newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h dither.h video.h proto.h vb.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
+.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-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 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-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 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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_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 \
+ $(ACE_ROOT)/ace/ARGV.h \
+ $(ACE_ROOT)/ace/ARGV.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/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 \
+ $(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/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/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 \
+ $(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 \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(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_shared/ReceiverS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/ReceiverS.i \
+ ab.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 \
+ $(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 \
+ vb.h ctr.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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..5f5ac9e4b87 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
@@ -976,17 +976,13 @@ int CTRmain(int argc,
       int result = command_handler.run ();
       if (ABpid == 0)
         {
-          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()\n",ACE_OS::getpid ()));
+          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()",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"));
         }
 
       if (VBpid == 0)
         {
-          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()\n",ACE_OS::getpid ()));
+          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()",ACE_OS::getpid ()));
           ACE_Reactor::instance ()->run_event_loop ();
         }
       
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..0f2ab37c5af 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
@@ -1111,7 +1111,7 @@ Notification_Handler::handle_input (ACE_HANDLE fd)
   switch (message[0])
     {
     case EXIT:
-      ACE_DEBUG ((LM_DEBUG,"VB process exiting because of exit signal\n"));
+      ACE_DEBUG ((LM_DEBUG,"AB process exiting because of exit signal\n"));
       set_exit_routine_tag(0);
       VideoBuffer::VBdeleteBuf();
       ACE_Reactor::instance ()->end_event_loop (); 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
index 8c14d8a0851..976f3c71266 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,21 +34,20 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 ##LIBS 	+= -lTAO -lACE
 
+#----------------------------------------------------------------------------
+#	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)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
+ifneq (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BUILD =
   override INSTALL =
 endif # ! AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -64,8 +63,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.
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..0cecd771f5c 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];
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..855c58d5a0a 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];
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..63c72635b66 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;
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..fdae77499c6 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];
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
index 76c34372e40..67e05c3bafe 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,21 +25,20 @@ LIBS 	+= -lTAO -lACE -lorbsvcs
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT)
 
+#----------------------------------------------------------------------------
+#	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)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
+ifneq (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BUILD =
   override INSTALL =
 endif # ! AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -57,8 +56,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.
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..0df103037f9 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$")
 
@@ -652,6 +651,46 @@ static void WriteInfoToFile(void)
   return;
 }
 
+/*
+#define nextByte  {fileptr ++; \
+		   if (fread(&nb, 1, 1, fp) == 0) \
+		   { \
+		    ACE_OS::perror ("VS Crossed EOF or error while scanning"); \
+		     return 1; \
+		   } }
+
+*/
+
+#define nextByte  {int val; fileptr ++; \
+		   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
+		   {\
+		    ACE_OS::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;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
index f756a1d14fa..228d55b78b2 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,21 +37,20 @@ CPPFLAGS += -I$(MPEG_ROOT)
 
 LIBS 	+= -lTAO -lACE
 
+#----------------------------------------------------------------------------
+#	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)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
+ifneq (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BUILD =
   override INSTALL =
 endif # ! AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -72,8 +71,11 @@ 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.
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..e4fa8d8a6b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
@@ -132,11 +132,11 @@ 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)
@@ -144,7 +144,6 @@ int usleep(unsigned int usec)
    ACE_OS::perror ("sleep with select");
     ACE_OS::exit (1);
   }
-  return 0;
 }
 #endif
 
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..c08a80305a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp
@@ -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)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
index caa8796b159..e1eab9e2985 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
@@ -35,20 +35,19 @@ 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
+#----------------------------------------------------------------------------
+#	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)))
-  BIN = $(BIN2)
+  BIN = augmented_server server vs as 
 endif # AV
 
-#----------------------------------------------------------------------------
-#	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
@@ -85,13 +84,787 @@ 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/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/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 \
+ $(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/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/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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/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 \
+ $(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/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/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_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)/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/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 \
+ $(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/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 \
+ $(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 \
+ vs.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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)/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/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 \
+ $(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.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/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/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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/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 \
+ $(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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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)/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/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 \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/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)/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
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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..85ea15bc4d6 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
@@ -112,7 +112,8 @@ class MMDevice_Exporter_i
     public TAO_Exportable,
     public TAO_PropertySet
 {
-public:
+
+  public:
   CORBA_Object_ptr audio_mmdevice_;
   CORBA_Object_ptr video_mmdevice_;
 
@@ -125,9 +126,9 @@ 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 ());
@@ -136,8 +137,9 @@ public:
 
   virtual int define_properties (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
                                  CORBA::ULong offset = 0) const;
-private:
-  
+
+  private:
+
   CORBA::ULong connections_;
   // Number of active connections
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
index e25db66486f..59222292979 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
@@ -1,5 +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.
+#
+#   -ORBsystemidpolicydemuxstrategy <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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 ###static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index c25b22626e2..d521fdcbb2c 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -6,7 +6,7 @@
 shared_libs_only=1
 MAKEFILE = Makefile
 LIBNAME  = libavdemo
-SHLIB2   = $(LIBNAME).$(SOEXT)
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 IDL_SRCS= Video_Repository
 
@@ -35,8 +35,6 @@ 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
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -48,8 +46,7 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BUILD := TAO_VR.module $(BUILD)
-  BIN = $(BIN2)
-  SHLIB = $(SHLIB2)
+  BIN = main
 else  # ! AV
   BUILD =
   override INSTALL =
@@ -77,8 +74,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
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
index 9f72c4e7fc4..23a2744574f 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
@@ -20,20 +20,19 @@ AVStreams_CLIENT_OBJS = client.o
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = client server
+#----------------------------------------------------------------------------
+#       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)))
-  BIN = $(BIN2)
+  BIN = client server
 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
@@ -41,7 +40,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 DCFLAGS = -g
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..5d20e44e7e2 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -68,7 +68,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" \
@@ -118,6 +117,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -170,8 +170,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,7 +184,6 @@ 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 \
@@ -218,38 +216,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -270,10 +266,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -365,19 +361,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -388,13 +382,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -418,6 +405,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -481,7 +469,6 @@ 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 \
@@ -514,38 +501,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -566,10 +551,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -661,19 +646,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -684,13 +667,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -713,6 +689,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -776,7 +753,6 @@ 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 \
@@ -809,38 +785,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -861,10 +835,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -956,19 +930,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -979,13 +951,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1008,6 +973,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1071,7 +1037,6 @@ 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 \
@@ -1104,38 +1069,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1156,10 +1119,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1251,19 +1214,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1274,13 +1235,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1288,6 +1242,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1351,7 +1306,6 @@ 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 \
@@ -1384,38 +1338,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1436,10 +1388,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1531,19 +1483,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1554,18 +1504,12 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1632,7 +1576,6 @@ 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 \
@@ -1665,38 +1608,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1717,10 +1658,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1812,19 +1753,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1835,13 +1774,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1850,6 +1782,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1913,7 +1846,6 @@ 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 \
@@ -1946,38 +1878,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1998,10 +1928,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2093,19 +2023,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2116,13 +2044,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_test_utils.h CC_naming_service.h \
@@ -2147,6 +2068,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -2210,7 +2132,6 @@ 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 \
@@ -2243,38 +2164,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2295,10 +2214,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2390,19 +2309,17 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2413,13 +2330,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_naming_service.h \
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/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index 142f262f775..49521cf5866 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -50,6 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
@@ -113,7 +114,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -146,38 +146,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -198,10 +196,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -293,19 +291,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -316,13 +312,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -431,6 +420,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
@@ -494,7 +484,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -527,38 +516,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -579,10 +566,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -674,19 +661,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -697,13 +682,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -723,6 +701,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
@@ -786,7 +765,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -819,38 +797,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -871,10 +847,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -966,19 +942,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -989,13 +963,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index e86fb2caa80..6b72e3a96d8 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -77,6 +77,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
@@ -140,7 +141,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_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 \
@@ -173,38 +173,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -225,10 +223,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -320,19 +318,17 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -343,13 +339,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -373,6 +362,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
@@ -436,7 +426,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_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 \
@@ -469,38 +458,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -521,10 +508,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -616,19 +603,17 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -639,13 +624,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -680,6 +658,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
@@ -743,7 +722,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_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 \
@@ -776,38 +754,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -828,10 +804,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -923,19 +899,17 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -946,13 +920,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index ba00ceaa1ab..ca2fffd87b9 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -115,7 +109,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -148,38 +141,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -200,10 +191,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -295,19 +286,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -318,13 +307,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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..7e87c4770f7 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)
         {
@@ -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..3e87a6ed9a1 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,7 @@ realclean:
  $(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 \
@@ -138,7 +133,6 @@ 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 \
@@ -171,38 +165,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -223,10 +215,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -318,19 +310,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -341,13 +331,6 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -436,6 +419,7 @@ realclean:
  $(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 \
@@ -509,7 +493,6 @@ 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 \
@@ -542,38 +525,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -594,10 +575,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -689,19 +670,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -712,13 +691,6 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -806,6 +778,7 @@ realclean:
  $(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 \
@@ -869,7 +842,6 @@ 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 \
@@ -902,38 +874,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -954,10 +924,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1049,19 +1019,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1071,19 +1039,13 @@ realclean:
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1147,7 +1109,6 @@ 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 \
@@ -1180,38 +1141,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1232,10 +1191,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1327,19 +1286,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1349,19 +1306,13 @@ realclean:
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1432,8 +1383,7 @@ 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 \
+ dataC.h $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1445,7 +1395,6 @@ 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 \
@@ -1462,38 +1411,36 @@ 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 \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1514,10 +1461,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1606,19 +1553,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1628,14 +1573,6 @@ realclean:
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index cd524449573..d052398be35 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -10,7 +10,7 @@
 #include "orbsvcs/Time_Utilities.h"
 
 #include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Basic_Factory.h"
 
 #include "EC_Mcast.h"
 
@@ -118,9 +118,9 @@ 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);
+      TAO_EC_Basic_Factory ec_factory (root_poa.in ());
+
+      TAO_EC_Event_Channel ec_impl (&ec_factory);
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
@@ -252,7 +252,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
   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;
@@ -789,8 +789,7 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
   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",
@@ -960,15 +959,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);
@@ -1122,8 +1120,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/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 7764d2db564..44045a9400b 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -117,7 +111,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -150,38 +143,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -202,10 +193,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -297,19 +288,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -320,13 +309,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -370,8 +352,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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_Basic_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
  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
deleted file mode 100644
index 925d535e41b..00000000000
--- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECfiltering basic -ECpushsupplierset delayed -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier -ECobserver basic"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 3eba6826489..47e3a118fa6 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);
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 15150a34ac5..90a7c6a2f11 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -115,7 +109,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -148,38 +141,36 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -200,10 +191,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -295,19 +286,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -318,13 +307,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 235306bb1ca..946d4cde39a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -103,20 +103,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 +125,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 +133,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 ()));
@@ -161,7 +158,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);
             }
         }
@@ -171,9 +168,20 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
           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..8b33409dd5b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -13,14 +13,16 @@
 #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
 {
@@ -52,12 +54,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 +76,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..79854c466af 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -27,7 +27,6 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void)
     n_suppliers_ (1),
     type_start_ (ACE_ES_EVENT_UNDEFINED),
     type_count_ (1),
-    shutdown_event_channel_ (1),
     pid_file_name_ (0),
     active_count_ (0)
 {
@@ -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)
     {
@@ -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;
@@ -306,7 +292,6 @@ 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> "
@@ -329,7 +314,7 @@ 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);
     }
@@ -337,7 +322,7 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
   if (this->type_count_ <= 0)
     {
       this->type_count_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of event types "
                          "suppliers out of range, reset to default (1)\n",
                          argv[0]), -1);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index a05a822a151..4eaf51054c6 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -79,9 +79,6 @@ private:
   // 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.
-
   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..8f4b7103195 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,31 @@ 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.0;
+  double max_usec = ACE_CU64_TO_CU32 (this->max_) / 1000.0;
+  double avg_usec = ACE_CU64_TO_CU32 (avg) / 1000.0;
+  double dev_usec = ACE_CU64_TO_CU32 (dev) / 1000.0;
   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..8b750a7ba36 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -128,12 +128,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_);
 
@@ -155,7 +163,7 @@ 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)
@@ -171,28 +179,14 @@ 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..233e270f3d7 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -12,14 +12,15 @@
 #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>
 {
@@ -63,9 +64,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,7 +81,7 @@ 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_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 7ccdb843f82..a0aa22447ab 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -77,7 +77,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                   "  burst count = <%d>\n"
                   "  burst size = <%d>\n"
                   "  event size = <%d>\n"
-                  "  burst pause = <%d>\n"
+                  "  burst size = <%d>\n"
                   "  type start = <%d>\n"
                   "  type count = <%d>\n"
                   "  pid file name = <%s>\n",
@@ -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
@@ -323,7 +320,7 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
                       "-u <burst count> "
                       "-n <burst size> "
                       "-b <event payload size> "
-                      "-t <burst pause (usecs)> "
+                      "-T <burst pause (usecs)> "
                       "-h <type_start,type_count> "
                       "-p <pid file name> "
                       "\n",
@@ -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_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 3381064c357..d74d353358b 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,7 +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_Basic_Factory.h"
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
 #include "ECT_Throughput.h"
 
@@ -24,8 +23,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);
 }
@@ -48,9 +45,8 @@ ECT_Throughput::ECT_Throughput (void)
     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),
+    ec_concurrency_hwm_ (1)
 {
 }
 
@@ -63,10 +59,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,7 +88,7 @@ ECT_Throughput::run (int argc, char* argv[])
                   "  burst count = <%d>\n"
                   "  burst size = <%d>\n"
                   "  event size = <%d>\n"
-                  "  burst pause = <%d>\n"
+                  "  burst size = <%d>\n"
                   "  consumer type start = <%d>\n"
                   "  consumer type count = <%d>\n"
                   "  consumer type shift = <%d>\n"
@@ -137,30 +129,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"));
@@ -214,6 +200,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 +208,36 @@ 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);
+          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;
+          ec->consumer_admin ()->busy_hwm (this->ec_concurrency_hwm_);
 
-          auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
-          ec_impl = auto_ec_impl;
+          ec_impl =
+            auto_ptr<POA_RtecEventChannelAdmin::EventChannel> (ec);
         }
 
       RtecEventChannelAdmin::EventChannel_var channel =
@@ -279,6 +264,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 +297,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 +309,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
     {
@@ -428,19 +413,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,30 +442,20 @@ 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");
 }
 
@@ -599,7 +564,6 @@ ECT_Throughput::parse_args (int argc, char *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
                       "[ORB options] "
-                      "-r -d -x "
                       "-c <n_consumers> "
                       "-s <n_suppliers> "
                       "-u <burst count> "
@@ -651,7 +615,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 +626,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,7 +636,7 @@ 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);
@@ -681,7 +645,7 @@ ECT_Throughput::parse_args (int argc, char *argv [])
   if (this->ec_concurrency_hwm_ <= 0)
     {
       this->ec_concurrency_hwm_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: invalid concurrency HWM, "
                          "reset to default (%d)\n",
                          argv[0], 1), -1);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 8cf8380cda0..47d1ff7dacd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -132,9 +132,6 @@ private:
 
   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..8907989d4d8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,9 +1,11 @@
 # $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 \
@@ -13,22 +15,9 @@ 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)) \
+	ECT_Supplier_Driver.cpp \
+	ECT_Consumer_Driver.cpp
 
 #----------------------------------------------------------------------------
 #       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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -138,7 +131,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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 \
@@ -171,38 +163,36 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -223,10 +213,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -318,19 +308,17 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -341,13 +329,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -362,7 +343,9 @@ 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 \
@@ -380,12 +363,14 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -459,7 +444,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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 \
@@ -492,38 +476,36 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -544,10 +526,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -639,19 +621,17 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -662,13 +642,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -683,7 +656,9 @@ 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 \
@@ -701,12 +676,14 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -726,8 +703,6 @@ 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 \
@@ -782,7 +757,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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 \
@@ -815,38 +789,36 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -867,10 +839,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -962,19 +934,17 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -985,13 +955,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1077,16 +1040,21 @@ 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_Basic_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_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_Command.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Command.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \
  ECT_Throughput.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/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
@@ -1096,6 +1064,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1168,7 +1137,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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 \
@@ -1201,38 +1169,36 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1253,10 +1219,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1348,19 +1314,17 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1371,13 +1335,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1422,6 +1379,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1494,7 +1452,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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 \
@@ -1527,38 +1484,36 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1579,10 +1534,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1674,19 +1629,17 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1697,13 +1650,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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/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..218c5d1debc 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"
@@ -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.
@@ -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..d546ea472e3 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
+
 
-LDLIBS = -lorbsvcs -lTAO
+EVENT_LATENCY_SRCS= \
+	Event_Latency.cpp
 
-BIN2 = Event_Latency
+LSRC= \
+	$(EVENT_LATENCY_SRCS) \
+
+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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -127,7 +126,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -160,38 +158,36 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -212,10 +208,10 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -306,19 +302,17 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -329,13 +323,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -354,8 +341,7 @@ 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 \
@@ -371,21 +357,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(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/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index c08aa8fdea8..1133a66d01e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -17,7 +17,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
 IDL_SRC = AirplaneS.cpp AirplaneC.cpp NesteaS.cpp NesteaC.cpp
-PROG_SRCS = \
+PROG_SRCS = Repository.cpp \
             Repository_Test.cpp \
             airplane_client.cpp \
             airplane_server.cpp \
@@ -57,9 +57,9 @@ NESTEA_SERVER_OBJS =  NesteaC.o \
                       nestea_i.o \
                       IR_Helper.o
 
-REPOSITORY_TEST_OBJS =  Repository_Test.o \
-                        Repository.o \
-                        Options.o
+
+REPOSITORY_TEST_OBJS =  ../../../ImplRepo_Service/$(VDIR)/Repository.o \
+                        Repository_Test.o
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -86,7 +86,6 @@ 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.lib.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
@@ -116,15 +115,6 @@ 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}
-
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -132,6 +122,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -142,12 +133,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -189,13 +182,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -228,38 +218,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -280,10 +268,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -375,19 +363,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -398,18 +384,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -420,12 +400,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -467,13 +449,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -506,38 +485,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -558,10 +535,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -653,19 +630,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -676,19 +651,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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 \
@@ -699,12 +668,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -746,13 +717,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -785,38 +753,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -837,10 +803,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -932,19 +898,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -954,19 +918,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -977,12 +935,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1024,13 +984,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -1063,38 +1020,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1115,10 +1070,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1210,19 +1165,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1232,20 +1185,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Union.h NesteaC.i \
+ NesteaS.h NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1253,18 +1200,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/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/Containers.h \
+ $(ACE_ROOT)/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,15 +1228,79 @@ $(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/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/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/Signal.h \
- $(ACE_ROOT)/ace/Containers.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_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/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-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/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1295,23 +1308,57 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/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 +1369,16 @@ $(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
+ $(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/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/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 \
@@ -1337,12 +1389,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1384,13 +1438,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -1423,38 +1474,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1475,10 +1524,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1570,19 +1619,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1593,13 +1640,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1609,6 +1649,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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 \
@@ -1618,9 +1659,11 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1662,13 +1705,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -1683,15 +1723,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1720,9 +1751,16 @@ $(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 \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 \
  airplane_i.h AirplaneS.h AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -1732,8 +1770,6 @@ $(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 \
@@ -1741,6 +1777,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1755,10 +1793,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1850,19 +1888,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1873,13 +1909,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1892,6 +1921,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1902,12 +1932,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -1949,13 +1981,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -1988,38 +2017,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2040,10 +2067,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2135,19 +2162,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2158,15 +2183,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ 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
@@ -2178,6 +2195,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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 \
@@ -2187,9 +2205,11 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -2231,13 +2251,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -2252,15 +2269,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2289,9 +2297,16 @@ $(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 \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 \
  airplane_i.h AirplaneS.h AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -2301,8 +2316,6 @@ $(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 \
@@ -2310,6 +2323,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2324,10 +2339,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2419,19 +2434,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2442,13 +2455,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2464,6 +2470,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2474,12 +2481,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2521,13 +2530,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -2560,38 +2566,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2612,10 +2616,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2707,19 +2711,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2730,18 +2732,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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 \
@@ -2752,12 +2748,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -2799,13 +2797,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -2838,38 +2833,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2890,10 +2883,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2985,19 +2978,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3007,15 +2998,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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 \
@@ -3024,6 +3008,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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 \
@@ -3033,9 +3018,11 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -3077,13 +3064,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -3098,15 +3082,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3135,10 +3110,17 @@ $(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 \
- nestea_i.h NesteaS.h NesteaC.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 nestea_i.h \
+ NesteaS.h NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3147,8 +3129,6 @@ $(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 \
@@ -3156,6 +3136,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3170,10 +3152,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -3265,19 +3247,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3287,15 +3267,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/tao/Union.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 \
@@ -3305,6 +3278,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3315,12 +3289,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -3362,13 +3338,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -3401,38 +3374,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3453,10 +3424,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -3548,19 +3519,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3570,16 +3539,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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
@@ -3591,6 +3552,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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 \
@@ -3600,9 +3562,11 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -3644,13 +3608,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -3665,15 +3626,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3702,10 +3654,17 @@ $(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 \
- nestea_i.h NesteaS.h NesteaC.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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 nestea_i.h \
+ NesteaS.h NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3714,8 +3673,6 @@ $(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 \
@@ -3723,6 +3680,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3737,10 +3696,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -3832,19 +3791,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3854,15 +3811,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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)/tao/Union.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 \
@@ -3876,6 +3826,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3886,12 +3837,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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 \
@@ -3933,13 +3886,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -3972,38 +3922,36 @@ $(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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4024,10 +3972,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -4119,19 +4067,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4141,15 +4087,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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 \
@@ -4168,6 +4107,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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 \
@@ -4177,9 +4117,11 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -4221,13 +4163,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -4242,15 +4181,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -4279,9 +4209,16 @@ $(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 \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/ImplRepoC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -4291,8 +4228,6 @@ $(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 \
@@ -4300,6 +4235,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -4314,10 +4251,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -4409,19 +4346,17 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4432,13 +4367,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
index 150c1bd52f3..0be9ee1e792 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
@@ -1,6 +1,5 @@
 // $Id$
 
-// Just implements a nice little Nestea server
 interface Nestea_Bookshelf
 {
   void drink (in long cans);
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/implrepo.conf b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
index f90601df906..dfef701b2ae 100644
--- a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
@@ -1,4 +1,4 @@
 # $Id$
-static Resource_Factory "-ORBresources tss"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null"
+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 -ORBpoalock null -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 4ed1a895e0e..46471c24ce8 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -13,6 +13,30 @@ Nestea_Client_i::Nestea_Client_i (void)
 {
 }
 
+// Reads the Server factory ior from a file
+
+int
+Nestea_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.
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
index 9b23cf6be44..5a428183d36 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
@@ -44,6 +44,9 @@ 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.
 
@@ -63,4 +66,4 @@ private:
   // Remember our orb.
 };
 
-#endif /* NESTEA_CLIENT_I_H */
+#endif /* Nestea_CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 2ed96b25d38..90a6bab52da 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -60,10 +60,7 @@ Nestea_i::crush (CORBA::Long cans,
   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;
+  this->cans_ -= cans;
   
   if (this->shutdown_ != 0)
     TAO_ORB_Core_instance ()->orb ()->shutdown ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index e5673015ac2..b9c2b10e3ea 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "nestea_server_i.h"
+//#include "ace/file_connector.h"
 
 ACE_RCSID(ImplRepo, nestea_server, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index b37cd2b6179..a5513b9f312 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/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;
@@ -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);
@@ -68,7 +67,7 @@ sub nestea_test
 
 sub nestea_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);
@@ -85,7 +84,7 @@ sub nestea_ir_test
 
 sub both_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);
@@ -126,27 +125,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")
     {
-      nestea_test ();
+      nestea_test ();    
       exit;
     }
     if ($ARGV[$i] eq "nestea_ir")
     {
-      nestea_ir_test ();
+      nestea_ir_test ();    
       exit;
     }
     if ($ARGV[$i] eq "both_ir")
     {
-      both_ir_test ();
+      both_ir_test ();    
       exit;
     }
 
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..b8dfa81f299 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -62,6 +62,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -126,7 +127,6 @@ 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 \
@@ -159,38 +159,36 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -211,10 +209,10 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -306,19 +304,17 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -329,13 +325,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +347,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -433,7 +423,6 @@ 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 \
@@ -466,38 +455,36 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -518,10 +505,10 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -605,19 +592,17 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -628,13 +613,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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/Makefile b/TAO/orbsvcs/tests/Makefile
index cb6c4e9d3a3..c4247d21f1b 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -23,8 +23,7 @@ DIRS  =	Simple_Naming \
 	CosEC_Multiple \
 	ImplRepo \
 	Sched_Conf \
-	Time \
-	Event
+	Time
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 2186d9f72b0..15c81746161 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -64,18 +64,21 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -117,13 +120,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -138,15 +138,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -175,9 +166,16 @@ 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)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/Property/CosPropertyService_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
@@ -190,8 +188,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -199,6 +195,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -213,10 +211,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -308,19 +306,17 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -331,13 +327,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -362,15 +351,19 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/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 \
@@ -392,7 +385,6 @@ 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 \
@@ -432,8 +424,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -484,7 +474,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_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 \
@@ -499,6 +488,9 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -508,11 +500,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
@@ -525,8 +512,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -534,6 +519,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -548,10 +535,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -611,19 +598,17 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -634,13 +619,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/Property/README b/TAO/orbsvcs/tests/Property/README
index 6ff16d26744..d4ef6651baa 100644
--- a/TAO/orbsvcs/tests/Property/README
+++ b/TAO/orbsvcs/tests/Property/README
@@ -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:
 -----
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 2a564b1e9dc..138f21d5643 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,13 @@ 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);
+                                                           env);
   ACE_UNUSED_ARG (return_val);
-  ACE_CHECK_RETURN (-1);
-
+  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 +392,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 +406,28 @@ 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_UNUSED_ARG (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 +438,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 +453,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 +463,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 +475,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 +483,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 +491,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 +499,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 +512,15 @@ 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);
+    this->propsetdef_->get_number_of_properties (env);
   ACE_UNUSED_ARG (num_of_properties);
-  ACE_CHECK_RETURN ( -1);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Get half on the properties and half of on the iterator.
   CORBA::ULong how_many = 1;
@@ -531,17 +530,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 +586,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,15 +637,15 @@ 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;
 }
@@ -654,7 +653,7 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
 // 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 +672,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 +693,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 +715,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 +730,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 +749,36 @@ 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_UNUSED_ARG (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 ());
-
+      
       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 +787,41 @@ 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);
+  TAO_ENDTRY;
   return 0;
 }
 
 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;
+  TAO_ENDTRY;
 
   return 0;
 }
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/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index f833c678ac6..290b2b81a18 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
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 6038aad2fe3..03f9dc15fdc 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,7 @@ 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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -114,7 +111,6 @@ 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/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -147,38 +143,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -199,10 +193,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -294,19 +288,17 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -317,13 +309,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 3af4409a25f..88eaa9e9ee0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -68,6 +68,7 @@ realclean:
  $(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 \
@@ -131,7 +132,6 @@ 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 \
@@ -164,38 +164,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -216,10 +214,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -311,19 +309,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -334,19 +330,13 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -410,7 +400,6 @@ 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 \
@@ -443,38 +432,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -495,10 +482,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -590,19 +577,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -613,19 +598,13 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -689,7 +668,6 @@ 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 \
@@ -722,38 +700,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -774,10 +750,10 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -869,19 +845,17 @@ realclean:
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -892,13 +866,6 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 1fbb81dbfc9..064e2bd7411 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.
@@ -349,17 +343,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
     {
       test_ref_ =
-        test_obj_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
+        test_obj_impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Get the IOR for the Naming Service.  Each thread
@@ -389,7 +379,6 @@ 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
@@ -400,19 +389,15 @@ 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)
     {
       test_ref =
-        test_obj_impl->_this (ACE_TRY_ENV);
+        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);      
     }
   ACE_CATCHANY
     {
@@ -536,13 +521,9 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
   ACE_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);
+        test_obj_impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Bind an object to the Naming Context.
@@ -613,13 +594,9 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       ACE_TRY_CHECK;
 
       // 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);
+      My_Test_Object impl1 (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;
-
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
@@ -693,14 +670,9 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                           -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);
+      My_Test_Object impl2 (CosNaming_Client::OBJ2_ID);
+      Test_Object_var obj2 = impl2._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       root_context->rebind (test_name,
                             obj2.in (),
                             ACE_TRY_ENV);
@@ -756,12 +728,9 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       ACE_TRY_CHECK;
 
       // 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);
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
@@ -849,12 +818,9 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
       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);
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
       root_context->bind (test_name,
                           obj.in (),
                           ACE_TRY_ENV);
@@ -887,12 +853,9 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
       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);
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       root_context->bind (test_name,
                           obj.in (),
                           ACE_TRY_ENV);
@@ -1045,10 +1008,17 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
   ACE_TRY
     {
       // Instantiate four dummy objects.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      My_Test_Object impl1;
+      Test_Object_var obj1 = impl1._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      My_Test_Object impl2;
+      Test_Object_var obj2 = impl2._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      My_Test_Object impl3;
+      Test_Object_var obj3 = impl3._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      My_Test_Object impl4;
+      Test_Object_var obj4 = impl4._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Bind objects to the naming context.
@@ -1065,19 +1035,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in (),
+                          obj1.in (),
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
       root_context->bind (name2,
-                          obj.in (),
+                          obj2.in (),
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
       root_context->bind (name3,
-                          obj.in (),
+                          obj3.in (),
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
       root_context->bind (name4,
-                          obj.in (),
+                          obj4.in (),
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -1162,12 +1132,9 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
       ACE_TRY_CHECK;
 
       // 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);
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
@@ -1190,7 +1157,6 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
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/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index 61f5348c462..82666fda853 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -72,6 +72,7 @@ realclean: clean
  $(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 \
@@ -135,7 +136,6 @@ 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 \
@@ -168,38 +168,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -220,10 +218,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -315,19 +313,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -338,13 +334,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -370,6 +359,7 @@ realclean: clean
  $(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 \
@@ -438,7 +428,6 @@ 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 \
@@ -471,38 +460,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -523,10 +510,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -618,19 +605,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -641,13 +626,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/orbsvcs/tests/Time/implrepo.conf b/TAO/orbsvcs/tests/Time/implrepo.conf
index 40da4ea1084..88478c8ac0c 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"
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..d796244c8fe 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -35,7 +35,7 @@ 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,
@@ -62,14 +62,8 @@ 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:
+	-$(RM) *.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.*
@@ -85,6 +79,7 @@ realclean: clean
  $(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 \
@@ -148,7 +143,6 @@ 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 \
@@ -181,38 +175,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -233,10 +225,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -328,19 +320,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -350,19 +340,13 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -426,7 +410,6 @@ 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 \
@@ -459,38 +442,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -511,10 +492,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -606,19 +587,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -628,19 +607,13 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -704,7 +677,6 @@ 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 \
@@ -737,38 +709,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -789,10 +759,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -884,19 +854,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -906,47 +874,27 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1010,7 +958,6 @@ 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 \
@@ -1043,38 +990,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1095,10 +1040,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1190,19 +1135,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1212,30 +1155,20 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1299,7 +1232,6 @@ 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 \
@@ -1332,38 +1264,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1384,10 +1314,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1479,19 +1409,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1501,25 +1429,14 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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,22 +1445,13 @@ 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/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1607,7 +1515,6 @@ 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 \
@@ -1640,38 +1547,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1692,10 +1597,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -1787,19 +1692,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1809,48 +1712,28 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+ $(TAO_ROOT)/tao/Union.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-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1942,45 +1825,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/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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2001,10 +1881,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -2096,19 +1976,17 @@ realclean: clean
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2119,33 +1997,12 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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..e64601bc856 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;
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index b433c70c21d..98748f9bbec 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);
@@ -137,7 +137,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/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/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..67d5a0c16f6 100644
--- a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
@@ -55,8 +55,7 @@ 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
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 91ec2f6bf1b..8f9ef41ccfc 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -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.
@@ -143,71 +146,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -218,10 +191,36 @@ realclean: clean
  $(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,11 +229,8 @@ 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 \
@@ -253,7 +249,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -318,24 +313,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -346,13 +337,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
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_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 180d44c13b5..79172cf9b2b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -72,7 +72,7 @@ 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);
@@ -80,13 +80,13 @@ Cubit_Server::init (int argc,
 
   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 +105,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..7737b996e39 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -87,7 +87,7 @@ 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.
@@ -159,71 +159,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -234,10 +204,36 @@ realclean: clean
  $(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 \
@@ -246,11 +242,8 @@ 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 \
@@ -269,7 +262,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -334,24 +326,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -362,13 +350,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -437,71 +418,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -512,10 +463,36 @@ realclean: clean
  $(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 \
@@ -524,11 +501,8 @@ 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 \
@@ -547,7 +521,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -612,24 +585,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -640,13 +609,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -717,61 +679,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 +705,19 @@ 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/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/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -795,6 +725,8 @@ realclean: clean
  $(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 \
@@ -805,17 +737,40 @@ realclean: clean
  $(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 \
@@ -834,7 +789,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -898,24 +852,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -926,13 +876,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1005,61 +948,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 \
@@ -1067,15 +974,19 @@ 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/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/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1083,6 +994,8 @@ realclean: clean
  $(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 \
@@ -1093,17 +1006,40 @@ realclean: clean
  $(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 \
@@ -1122,7 +1058,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1186,24 +1121,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1214,13 +1145,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Timeprobe.h \
@@ -1305,71 +1229,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1380,10 +1274,36 @@ realclean: clean
  $(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,11 +1312,8 @@ 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 \
@@ -1415,7 +1332,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1479,24 +1395,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1507,13 +1419,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1594,71 +1499,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1669,10 +1544,36 @@ realclean: clean
  $(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,11 +1582,8 @@ 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 \
@@ -1704,7 +1602,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1768,24 +1665,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1796,13 +1689,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1880,71 +1766,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1955,10 +1811,36 @@ realclean: clean
  $(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,11 +1849,8 @@ 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 \
@@ -1990,7 +1869,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2054,24 +1932,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2082,13 +1956,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -2172,71 +2039,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2247,10 +2084,36 @@ realclean: clean
  $(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 \
@@ -2259,11 +2122,8 @@ 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 \
@@ -2282,7 +2142,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2346,24 +2205,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2374,13 +2229,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2453,71 +2301,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2528,10 +2346,36 @@ realclean: clean
  $(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 \
@@ -2540,11 +2384,8 @@ 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 \
@@ -2563,7 +2404,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2628,24 +2468,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2656,13 +2492,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/corba.h \
@@ -2731,71 +2560,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2806,10 +2605,36 @@ realclean: clean
  $(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 \
@@ -2818,11 +2643,8 @@ 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 \
@@ -2841,7 +2663,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2906,24 +2727,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2934,13 +2751,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3009,71 +2819,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3084,10 +2864,36 @@ realclean: clean
  $(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 \
@@ -3096,11 +2902,8 @@ 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 \
@@ -3119,7 +2922,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3184,24 +2986,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3212,13 +3010,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 12ef244c163..d0ca3fcd9d4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Cubit_Client.h"
 #include "tao/Timeprobe.h"
+#include "tests/test_config.h"
 
 ACE_RCSID(IDL_Cubit, client, "$Id$")
 
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_test.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp
index e0624781841..a62ab4f8501 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

 

@@ -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..a42a2a4ac86 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.
@@ -87,10 +86,6 @@ for ($i = 0; $i <= $#ARGV; $i++)
   }
 }
 
-(-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..06c301fbb88 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -2,6 +2,7 @@
 
 #include "Cubit_Server.h"
 #include "tao/Timeprobe.h"
+#include "tests/test_config.h"
 
 ACE_RCSID(IDL_Cubit, server, "$Id$")
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
index c3864a27b35..4262655e1f1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
@@ -26,8 +26,7 @@ CFG=IDL_Cubit Server - Win32 static 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

 

@@ -124,7 +123,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"

@@ -211,7 +210,7 @@ InputPath=.\cubit.idl
 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -281,13 +280,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 +320,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)

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 3e062048b55..b00e7c3de54 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 Resource_Factory "-ORBresources global -ORBreactorlock null -ORBinputcdrallocator tss"
+static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
index bbfeb53120f..d588d3049c5 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-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 Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBreactorlock null -ORBinputcdrallocator tss"
+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 -ORBallowreactivationofsystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 714f7ac2bc9..72e4ae4ec5b 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),
@@ -85,14 +83,9 @@ Globals::sched_fifo_init (void)
                                               ACE_SCOPE_PROCESS)))
     {
       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,
+                    "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..d760a2d2eb3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -92,6 +92,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 +117,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.
 
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..037153124b2 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
@@ -38,40 +38,19 @@ 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
 
 
 ########
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index 877e58936eb..4f35b748129 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,8 +95,11 @@ 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.
@@ -168,71 +171,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -243,10 +216,36 @@ realclean: clean
  $(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 \
@@ -255,11 +254,8 @@ 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 \
@@ -278,7 +274,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -343,24 +338,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -371,13 +362,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -446,71 +430,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -521,10 +475,36 @@ realclean: clean
  $(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 \
@@ -533,11 +513,8 @@ 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 \
@@ -556,7 +533,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -621,24 +597,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -649,13 +621,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(ACE_ROOT)/ace/OS.h \
@@ -730,71 +695,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -805,10 +740,36 @@ realclean: clean
  $(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 \
@@ -817,11 +778,8 @@ 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 \
@@ -840,7 +798,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -905,24 +862,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -933,13 +886,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1015,71 +961,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1090,10 +1006,36 @@ realclean: clean
  $(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 \
@@ -1102,11 +1044,8 @@ 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 \
@@ -1125,7 +1064,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1190,24 +1128,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1218,13 +1152,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -1375,45 +1302,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1424,9 +1347,9 @@ realclean: clean
  $(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 \
@@ -1436,11 +1359,8 @@ 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 \
@@ -1459,7 +1379,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -1491,24 +1410,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1519,13 +1434,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
  $(ACE_ROOT)/ace/Stats.h \
@@ -1605,71 +1513,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1680,10 +1558,36 @@ realclean: clean
  $(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,11 +1596,8 @@ 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 \
@@ -1715,7 +1616,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1780,24 +1680,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1808,13 +1704,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1960,45 +1849,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2009,9 +1894,9 @@ realclean: clean
  $(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 \
@@ -2021,11 +1906,8 @@ 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 \
@@ -2044,7 +1926,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -2076,24 +1957,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2104,13 +1981,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2180,71 +2050,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2255,10 +2095,36 @@ realclean: clean
  $(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 \
@@ -2267,11 +2133,8 @@ 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 \
@@ -2290,7 +2153,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2355,24 +2217,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2383,13 +2241,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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_Task.o .obj/Cubit_Task.so .shobj/Cubit_Task.o .shobj/Cubit_Task.so: Cubit_Task.cpp \
  $(ACE_ROOT)/ace/Sched_Params.h \
@@ -2527,46 +2378,40 @@ 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 \
- $(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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.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/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2574,6 +2419,8 @@ realclean: clean
  $(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 \
@@ -2587,11 +2434,8 @@ 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 \
@@ -2610,7 +2454,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -2643,24 +2486,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2671,13 +2510,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/TAO_Internal.h
 .obj/Globals.o .obj/Globals.so .shobj/Globals.o .shobj/Globals.so: Globals.cpp Globals.h \
@@ -2861,45 +2693,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2910,9 +2738,9 @@ realclean: clean
  $(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 \
@@ -2922,11 +2750,8 @@ 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 \
@@ -2945,7 +2770,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -2977,24 +2801,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3005,13 +2825,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index fdf3e82b503..3b7798994fa 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"
@@ -92,7 +92,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 +322,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 +390,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 +448,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 +604,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 +739,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 +768,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 +782,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 +796,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"));
 
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..1a045cf6c03 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_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 -*-
-
 $usage = "run_tests.pl [-l suppress -ORBgioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
 
 unshift @INC, '../../../../../bin';
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..92287d27674 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Resource_Factory "-ORBresources tss -ORBinputcdrallocator tss"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
+static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
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..4bef6ef3737
--- /dev/null
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static
@@ -0,0 +1,9 @@
+# $Id$
+#
+# See svc.conf in the same directory for more information.
+# To use this file instead of the default svc.conf, add
+# -ORBsvcconf svc.conf.static to your command line invocations
+# of the server and client.
+static Resource_Factory "-ORBresources tss -ORBinputcdrallocator tss"
+static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
+static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
diff --git a/TAO/performance-tests/Demux/Makefile b/TAO/performance-tests/Demux/Makefile
index fd61711b077..c39700d79e5 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.
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..2d312d42458 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.
diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
index 0369a6b783a..bf98d811277 100644
--- a/TAO/performance-tests/Pluggable/Makefile
+++ b/TAO/performance-tests/Pluggable/Makefile
@@ -66,7 +66,7 @@ client:	$(addprefix $(VDIR),$(PP_TEST_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) PP_TestC.* PP_TestS.* PP_TestS_T.*
+	-/bin/rm -rf 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_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 84c09c6b6a1..5b1f147ca0e 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -72,7 +72,7 @@ PP_Test_Server::init (int argc,
   // Now create the implementations
   this->factory_impl_ = new Pluggable_Test_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);
@@ -80,13 +80,13 @@ PP_Test_Server::init (int argc,
 
   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 +105,5 @@ PP_Test_Server::run (CORBA::Environment& ACE_TRY_ENV)
 
 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
index 762e8e67d55..3dd33c53616 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -69,9 +69,6 @@ private:
   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.
 
diff --git a/TAO/performance-tests/Pluggable/server.dsp b/TAO/performance-tests/Pluggable/server.dsp
index d1ca3ffd7a0..458261e6481 100644
--- a/TAO/performance-tests/Pluggable/server.dsp
+++ b/TAO/performance-tests/Pluggable/server.dsp
@@ -64,8 +64,8 @@ LINK32=link.exe
 # 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 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

@@ -121,21 +121,5 @@ SOURCE=.\PP_Test_Server.h
 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..07609b50261 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -58,8 +58,7 @@ 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.
 
@@ -130,7 +129,6 @@ 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 \
@@ -163,38 +161,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -217,8 +213,6 @@ 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 \
@@ -307,25 +301,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -333,13 +326,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -408,7 +394,6 @@ 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 \
@@ -441,38 +426,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -495,8 +478,6 @@ 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 \
@@ -585,25 +566,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -611,13 +591,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/ACE.h \
@@ -691,7 +664,6 @@ 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 \
@@ -724,38 +696,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -778,8 +748,6 @@ 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 \
@@ -868,25 +836,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -894,13 +861,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -974,7 +934,6 @@ 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 \
@@ -1007,38 +966,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1061,8 +1018,6 @@ 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 \
@@ -1151,25 +1106,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1177,13 +1131,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1259,7 +1206,6 @@ 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 \
@@ -1292,38 +1238,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1346,8 +1290,6 @@ 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 \
@@ -1436,25 +1378,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1462,13 +1403,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1537,7 +1471,6 @@ 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 \
@@ -1570,38 +1503,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1624,8 +1555,6 @@ 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 \
@@ -1714,25 +1643,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1740,13 +1668,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1819,7 +1740,6 @@ 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 \
@@ -1852,38 +1772,36 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1906,8 +1824,6 @@ 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 \
@@ -1996,25 +1912,24 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -2022,13 +1937,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
 # 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..f1553e03597 100644
--- a/TAO/performance-tests/Thruput/TAO/svc.conf
+++ b/TAO/performance-tests/Thruput/TAO/svc.conf
@@ -1,5 +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
+#
 static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy 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..c6d86ae0212 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -50,27 +50,29 @@ $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(TAO_IDL)
 else
 #### You can redefine the following in your platform_macros.GNU
 
-ifndef FLICK_SRCDIR
-  FLICK_SRCDIR  =       /project/doc/nanbor/mom
+ifndef SRCDIR
+  SRCDIR  =       /project/doc/nanbor/mom
 endif
-ifndef FLICK_OBJDIR
-  FLICK_OBJDIR  =       /project/doc/nanbor/dad
+ifndef OBJDIR
+  OBJDIR  =       /project/doc/nanbor/dad
 endif
 
-CCFLAGS += -I$(FLICK_OBJDIR)/runtime/headers -I$(FLICK_SRCDIR)/runtime/headers
+CCFLAGS += -I$(OBJDIR)/runtime/headers -I$(SRCDIR)/runtime/headers # -g
 
-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
+CORBA_FE=$(OBJDIR)/bin/flick-fe-newcorba
+CORBA_PG=$(OBJDIR)/bin/flick-c-pfe-corbaxx
+CORBA_BE=$(OBJDIR)/bin/flick-c-pbe-iiopxx
 
-$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl
+%C.h %C.i %C.cpp: %.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 && \
+	$(CORBA_BE) $*-client.prc -o $*C.cpp -h $*C.h -f $*S.h && \
 	echo > $*C.i
+
+%S.h %S.i %S.cpp: %.idl
 	$(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 && \
+	$(CORBA_BE) $*-server.prc --no_mu_stubs -o $*S.cpp -h $*S.h -F $*C.h && \
 	echo > $*S.i && \
         echo > $*S_T.h && \
         echo > $*S_T.i && \
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp
index 2bc90fe9095..582aee04212 100644
--- a/TAO/tao/Active_Object_Map.cpp
+++ b/TAO/tao/Active_Object_Map.cpp
@@ -12,17 +12,6 @@ ACE_RCSID(tao, POA, "$Id$")
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
-  : user_id_ (),
-    system_id_ (),
-    servant_ (0),
-    reference_count_ (1),
-    deactivated_ (0)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 /* static */
 size_t TAO_Active_Object_Map::system_id_size_ (0);
 
@@ -397,10 +386,7 @@ TAO_Unique_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &us
 
   if (result == 0)
     {
-      if (entry->servant_ != 0)
-        {
-          result = this->active_object_map_->servant_map_->unbind (entry->servant_);
-        }
+      result = this->active_object_map_->servant_map_->unbind (entry->servant_);
 
       if (result == 0)
         {
@@ -426,16 +412,9 @@ TAO_Unique_Id_Strategy::find_user_id_using_servant (PortableServer::Servant serv
 
   if (result == 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else
-        {
-          ACE_NEW_RETURN (user_id,
-                          PortableServer::ObjectId (entry->user_id_),
-                          -1);
-        }
+      ACE_NEW_RETURN (user_id,
+                      PortableServer::ObjectId (entry->user_id_),
+                      -1);
     }
 
   return result;
@@ -451,27 +430,13 @@ TAO_Unique_Id_Strategy::find_system_id_using_servant (PortableServer::Servant se
 
   if (result == 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else
-        {
-          result = this->active_object_map_->id_hint_strategy_->system_id (system_id,
-                                                                           *entry);
-        }
+      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
@@ -560,28 +525,6 @@ TAO_Multiple_Id_Strategy::find_system_id_using_servant (PortableServer::Servant
   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)
-    {
-      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;
-        }
-    }
-  return 0;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
@@ -597,39 +540,21 @@ TAO_Lifespan_Strategy::set_active_object_map (TAO_Active_Object_Map *active_obje
 ////////////////////////////////////////////////////////////////////////////////
 
 int
-TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                  const PortableServer::ObjectId &user_id,
+TAO_Transient_Strategy::find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                                   PortableServer::Servant &servant,
-                                                                  TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                  PortableServer::ObjectId &user_id)
 {
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
+  int result = this->active_object_map_->id_hint_strategy_->recover_key (system_id,
+                                                                         user_id);
+
   if (result == 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
-        {
-          result = -1;
-        }
-      else
-        {
-          servant = entry->servant_;
-        }
-    }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
+      TAO_Active_Object_Map::Map_Entry *entry = 0;
+      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)
+          if (entry->servant_ == 0)
             {
               result = -1;
             }
@@ -638,6 +563,22 @@ TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const Portable
               servant = entry->servant_;
             }
         }
+      else
+        {
+          result = this->active_object_map_->user_id_map_->find (user_id,
+                                                                 entry);
+          if (result == 0)
+            {
+              if (entry->servant_ == 0)
+                {
+                  result = -1;
+                }
+              else
+                {
+                  servant = entry->servant_;
+                }
+            }
+        }
     }
 
   return result;
@@ -646,40 +587,22 @@ TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const Portable
 ////////////////////////////////////////////////////////////////////////////////
 
 int
-TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                   const PortableServer::ObjectId &user_id,
+TAO_Persistent_Strategy::find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                                    PortableServer::Servant &servant,
-                                                                   TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                   PortableServer::ObjectId &user_id)
 {
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0 &&
-      user_id == entry->user_id_)
-    {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
-        {
-          result = -1;
-        }
-      else
-        {
-          servant = entry->servant_;
-        }
-    }
-  else
+  int result = this->active_object_map_->id_hint_strategy_->recover_key (system_id,
+                                                                         user_id);
+
+  if (result == 0)
     {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
+      TAO_Active_Object_Map::Map_Entry *entry = 0;
+      result = this->active_object_map_->id_hint_strategy_->find (system_id,
+                                                                  entry);
+      if (result == 0 &&
+          user_id == entry->user_id_)
         {
-          if (entry->deactivated_)
-            {
-              result = -1;
-            }
-          else if (entry->servant_ == 0)
+          if (entry->servant_ == 0)
             {
               result = -1;
             }
@@ -688,6 +611,22 @@ TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const Portabl
               servant = entry->servant_;
             }
         }
+      else
+        {
+          result = this->active_object_map_->user_id_map_->find (user_id,
+                                                                 entry);
+          if (result == 0)
+            {
+              if (entry->servant_ == 0)
+                {
+                  result = -1;
+                }
+              else
+                {
+                  servant = entry->servant_;
+                }
+            }
+        }
     }
 
   return result;
@@ -775,6 +714,7 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (PortableServer::S
                                                                         entry->user_id_);
   if (result == 0)
     {
+      entry->system_id_ = entry->user_id_;
       entry->servant_ = servant;
 
       result = this->active_object_map_->id_hint_strategy_->bind (*entry);
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index 825d4477a2b..84e113956bb 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -42,27 +42,6 @@ class TAO_Active_Object_Map
   //     Implementation to be used by the POA.
 public:
 
-  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_;
-  };
-
   TAO_Active_Object_Map (int user_id_policy,
                          int unique_id_policy,
                          int persistent_id_policy,
@@ -100,8 +79,7 @@ public:
 
   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);
+                                          const PortableServer::ObjectId &system_id);
   // Can be used with any policy.
 
   int unbind_using_user_id (const PortableServer::ObjectId &user_id);
@@ -123,10 +101,9 @@ public:
   // 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,
+  int find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                 PortableServer::Servant &servant,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
+                                                PortableServer::ObjectId &user_id);
   // Can be used with any policy.
 
   int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
@@ -135,34 +112,33 @@ public:
   // 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.
 
+  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.
+
+    PortableServer::ObjectId user_id_;
+    PortableServer::ObjectId system_id_;
+    PortableServer::Servant servant_;
+  };
+
   typedef ACE_Map<
   PortableServer::ObjectId,
     Map_Entry *> user_id_map;
@@ -267,10 +243,6 @@ public:
   // 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.
 
@@ -313,10 +285,6 @@ public:
                                   TAO_Active_Object_Map::Map_Entry *&entry);
   // 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);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -352,10 +320,6 @@ public:
                                   TAO_Active_Object_Map::Map_Entry *&entry);
   // 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);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -373,10 +337,9 @@ public:
   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,
+  virtual int find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry) = 0;
+                                                        PortableServer::ObjectId &user_id) = 0;
   // Can be used with any policy.
 
   void set_active_object_map (TAO_Active_Object_Map *active_object_map);
@@ -399,10 +362,9 @@ class TAO_Transient_Strategy : public TAO_Lifespan_Strategy
   //     Strategy for the TRANSIENT policy.
 public:
 
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
+  virtual int find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
+                                                        PortableServer::ObjectId &user_id);
   // Can be used with any policy.
 };
 
@@ -417,10 +379,9 @@ class TAO_Persistent_Strategy : public TAO_Lifespan_Strategy
   //     Strategy for the PERSISTENT policy.
 public:
 
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
+  virtual int find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
+                                                        PortableServer::ObjectId &user_id);
   // Can be used with any policy.
 
 };
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
index 82d7191f512..0a590990d71 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/Active_Object_Map.i
@@ -98,11 +98,11 @@ TAO_Active_Object_Map::find_system_id_using_user_id (const PortableServer::Objec
 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)
+                                                           const PortableServer::ObjectId &system_id)
 {
   ACE_UNUSED_ARG (system_id);
 
+  Map_Entry *entry = 0;
   return this->id_uniqueness_strategy_->bind_using_user_id (servant,
                                                             user_id,
                                                             entry);
@@ -139,11 +139,7 @@ TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectI
                                          entry);
   if (result == 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
+      if (entry->servant_ == 0)
         {
           result = -1;
         }
@@ -157,15 +153,13 @@ TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectI
 }
 
 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,
+TAO_Active_Object_Map::find_servant_and_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                                  PortableServer::Servant &servant,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                 PortableServer::ObjectId &user_id)
 {
-  return this->lifespan_strategy_->find_servant_using_system_id_and_user_id (system_id,
-                                                                             user_id,
+  return this->lifespan_strategy_->find_servant_and_user_id_using_system_id (system_id,
                                                                              servant,
-                                                                             entry);
+                                                                             user_id);
 }
 
 ACE_INLINE int
@@ -179,11 +173,7 @@ TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableS
 
   if (result == 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
+      if (entry->servant_ == 0)
         {
           result = -1;
         }
@@ -199,14 +189,6 @@ TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableS
 }
 
 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)
-{
-  return this->user_id_map_->find (user_id,
-                                   entry);
-}
-
-ACE_INLINE int
 TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                                      PortableServer::ObjectId_out user_id)
 {
@@ -224,26 +206,6 @@ TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::Objec
   return 0;
 }
 
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId &user_id)
-{
-  return this->id_hint_strategy_->recover_key (system_id,
-                                               user_id);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant)
-{
-  return this->id_uniqueness_strategy_->remaining_activations (servant);
-}
-
-ACE_INLINE size_t
-TAO_Active_Object_Map::current_size (void)
-{
-  return this->user_id_map_->current_size ();
-}
-
 /* static */
 ACE_INLINE size_t
 TAO_Active_Object_Map::system_id_size (void)
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index a620a4a57c0..52e9b34e54d 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,7 +117,6 @@ 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),
@@ -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
@@ -239,6 +241,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,7 +258,7 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
   CORBA::release (this->type_);
   this->type_ = tmp;
 
-  this->any_owns_data_ = 0;
+  this->any_owns_data_ = any_owns_data;
 
   this->cdr_ = ACE_Message_Block::duplicate (mb);
   // We can save the decode operation
@@ -340,7 +343,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 +351,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)
 {
@@ -845,7 +847,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;
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 4401d05fd27..2bc1ef2b49c 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
@@ -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_;
   };
 
@@ -295,6 +286,7 @@ public:
 
   void _tao_replace (CORBA::TypeCode_ptr,
                      const ACE_Message_Block *mb,
+                     CORBA::Boolean any_owns_data,
                      CORBA::Environment &TAO_IN_ENV =
                        CORBA::default_environment ());
   // Replace via message block instead of <value_>.
@@ -431,8 +423,6 @@ public:
   CORBA_Any *& ptr (void);
   // return underlying instance
 
-  CORBA_Any *operator-> (void);
-
 private:
   CORBA_Any *&ptr_;
   // Instance
@@ -443,83 +433,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..9913ee5dc2e 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -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,10 @@ CORBA_Any::operator<<= (const CORBA_Any& a)
   this->replace (CORBA::_tc_any, new CORBA_Any (a), 1, env);
 }
 
-// insertion of Any - non-copying
-ACE_INLINE void
-CORBA::Any::operator<<= (CORBA::Any_ptr anyptr)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_any, anyptr, 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 +117,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 +191,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 +247,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_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp
index d484286be3e..56e7d3b8812 100644
--- a/TAO/tao/CDR_Interpreter.cpp
+++ b/TAO/tao/CDR_Interpreter.cpp
@@ -190,7 +190,7 @@ 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)
@@ -231,7 +231,7 @@ 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
@@ -287,7 +287,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;
     }
 
@@ -303,7 +303,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       // 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,7 +326,7 @@ 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;
         }
 
@@ -345,7 +345,7 @@ 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;
@@ -373,7 +373,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
         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 +384,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;
@@ -401,7 +401,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
   else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0
            && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -421,7 +421,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;
     }
 
@@ -453,28 +453,21 @@ 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;
@@ -538,7 +531,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 +545,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;
       }
 
@@ -638,7 +631,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 +645,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 +656,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 +666,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 +701,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 +715,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 +728,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 +743,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 +756,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 +790,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.
@@ -844,7 +837,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;
     }
 
@@ -876,7 +869,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;
     }
 
@@ -901,7 +894,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 +911,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 +923,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 +933,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;
     }
 
@@ -995,7 +988,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 +1000,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 +1011,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 +1022,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 +1033,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,12 +1044,12 @@ 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;
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..d795afb6ac4 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -5,10 +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__)
@@ -74,18 +72,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 +83,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);
 }
@@ -214,8 +203,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 +232,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 +254,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);
@@ -268,30 +270,30 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
 
 #if !defined (TAO_NO_IOR_TABLE)
   if (ACE_OS::memcmp (object_key,
-                      &TAO_POA::objectkey_prefix[0],
-                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+		      &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);
+			     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 ()));
+	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);
+	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);
+	ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO), -1);
 
       // ObjectID present in the table with an associated NON-NULL reference.
       // Throw a forward request exception.
@@ -366,11 +368,11 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
 
 // #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)
+// 		      &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"));
+// 		  "TAO Object Key Prefix found in the object key.\n"));
 
 
 //       // Do the Table Lookup. Raise a location forward exception or
@@ -397,7 +399,7 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
 
   // this->handle_locate_i (....);
 
-  GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
+  IIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
                                     response_required,
                                     tmp_key,
                                     "_non_existent",
@@ -572,7 +574,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;
 
@@ -628,8 +630,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   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;
@@ -690,7 +691,7 @@ 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 ());
+              ACE_TRY_THROW (CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
               // NOTREACHED
 
             case TAO_GIOP::CommunicationError:
@@ -794,6 +795,11 @@ 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)
+{
+}
+
 // @@ Need to get rid of the Transport Objects!
 TAO_Client_Connection_Handler::~TAO_Client_Connection_Handler (void)
 {
@@ -807,6 +813,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 +869,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;
 }
@@ -915,119 +941,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
@@ -1081,6 +994,10 @@ 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!
 
+      int result = r->resume_handler (this);
+      ACE_UNUSED_ARG (result);
+      ACE_ASSERT (result == 0);
+
       // We're no longer expecting a response!
       this->expecting_response_ = 0;
     }
@@ -1107,12 +1024,6 @@ TAO_ST_Client_Connection_Handler::handle_input (ACE_HANDLE)
   return retval;
 }
 
-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)
@@ -1123,26 +1034,6 @@ TAO_MT_Client_Connection_Handler::TAO_MT_Client_Connection_Handler (ACE_Thread_M
 {
 }
 
-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)
 {
@@ -1197,7 +1088,7 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
 
       if (this->reactor () != r)
         {
-          ACE_Reactor_Mask mask =
+          ACE_Reactor_Mask mask = 
             ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
           this->reactor ()->remove_handler (this, mask);
 
@@ -1398,13 +1289,46 @@ 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..2d6f8940054 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,13 +150,11 @@ 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.
 
+protected:
   ACE_thread_t calling_thread_;
   // the thread ID of the thread we were running in.
 
@@ -283,10 +248,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
index 486ab584d3f..6bbe2795d24 100644
--- a/TAO/tao/Context.cpp
+++ b/TAO/tao/Context.cpp
@@ -1,15 +1,7 @@
 // $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__ */
@@ -43,133 +35,3 @@ CORBA_Context::_decr_refcnt (void)
   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
index f24fd9d4939..8058abf82b9 100644
--- a/TAO/tao/Context.h
+++ b/TAO/tao/Context.h
@@ -22,8 +22,6 @@
 
 #include "tao/corbafwd.h"
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 class TAO_Export CORBA_Context
 {
   // = TITLE
@@ -50,44 +48,6 @@ public:
   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;
@@ -170,126 +130,8 @@ 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
index d2ee3370ac1..eba2634aba8 100644
--- a/TAO/tao/Context.i
+++ b/TAO/tao/Context.i
@@ -25,12 +25,6 @@ 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
 // *************************************************************
@@ -191,185 +185,3 @@ 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/CurrentS.cpp b/TAO/tao/CurrentS.cpp
index faa403a31aa..21c556940be 100644
--- a/TAO/tao/CurrentS.cpp
+++ b/TAO/tao/CurrentS.cpp
@@ -16,14 +16,59 @@
 
 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 +101,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
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..5fb4f2e1da1 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -801,56 +801,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))
@@ -891,7 +1032,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 +1044,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 &)
 {
 }
@@ -1093,54 +1234,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
   )
@@ -1194,14 +1361,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 &)
 {
 }
@@ -1292,14 +1459,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 &)
 {
 }
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index d2b1120d485..735b1c4807a 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -45,9 +45,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 +83,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,6 +107,13 @@ 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:
@@ -108,9 +131,19 @@ public:
     );
   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:
@@ -137,9 +170,22 @@ public:
 
     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:
@@ -166,9 +212,22 @@ public:
 
     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:
@@ -195,9 +254,22 @@ public:
 
     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:
@@ -224,6 +296,9 @@ public:
 
     static CORBA::TypeCode_ptr _tc_InvalidSeq;
 
+
+#endif /* end #if !defined */
+
   virtual CORBA::TypeCode_ptr type (
       CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
@@ -429,11 +504,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 +547,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,6 +571,13 @@ 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:
@@ -529,97 +631,110 @@ private:
   void operator= (const CORBA_DynEnum &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynEnum;
 
+typedef char * FieldName;
+typedef CORBA::String_var FieldName_var;
+typedef CORBA::String_out FieldName_out;
+extern  CORBA::TypeCode_ptr  _tc_FieldName;
+
 // Forward declaration.
-struct CORBA_NameValuePair;
+struct NameValuePair;
 
-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
+struct  NameValuePair
 {
-  TAO_String_Manager id;
+  FieldName_var id;
   CORBA::Any value;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePair_ptr _ptr_type;
-  typedef CORBA_NameValuePair_var _var_type;
+  typedef NameValuePair_var _var_type;
 #endif /* __GNUC__ */
   // Useful for template programming.
 
 };
 
-class _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq : public TAO_Unbounded_Base_Sequence
+extern  CORBA::TypeCode_ptr  _tc_NameValuePair;
+
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_
+
+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 +742,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 +753,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 +763,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 +772,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 +809,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 +830,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 +838,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 +851,7 @@ public:
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA_NameValuePair*, this->buffer_);
+        result = ACE_reinterpret_cast (NameValuePair*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -745,7 +860,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 +870,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 +893,128 @@ public:
 
 };
 
+#endif /* end #if !defined */
+
+// Forward declarations.
+class NameValuePairSeq;
+typedef NameValuePairSeq *NameValuePairSeq_ptr;
+
 // *************************************************************
-// class CORBA::NameValuePairSeq_var
+// class NameValuePairSeq_var
 // *************************************************************
 
-class  CORBA_NameValuePairSeq_var
+class  NameValuePairSeq_var
 {
 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_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 &);
 };
 
+
+#endif /* end #if !defined */
+
+#if !defined (_NAMEVALUEPAIRSEQ_CH_)
+#define _NAMEVALUEPAIRSEQ_CH_
+
 // *************************************************************
-// CORBA::NameValuePairSeq
+// NameValuePairSeq
 // *************************************************************
-class TAO_Export CORBA_NameValuePairSeq : public
+class TAO_Export NameValuePairSeq : public
 #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 */
 {
 public:
-  CORBA_NameValuePairSeq (void); // default ctor
-  CORBA_NameValuePairSeq (CORBA::ULong max); // uses max size
-  CORBA_NameValuePairSeq (
+  NameValuePairSeq (void); // default ctor
+  NameValuePairSeq (CORBA::ULong max); // uses max size
+  NameValuePairSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA_NameValuePair *buffer,
+    NameValuePair *buffer,
     CORBA::Boolean release=0
   );
-  CORBA_NameValuePairSeq (const CORBA_NameValuePairSeq &); // copy ctor
-  ~CORBA_NameValuePairSeq (void); // dtor
+  NameValuePairSeq (const NameValuePairSeq &); // copy ctor
+  ~NameValuePairSeq (void); // dtor
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePairSeq_ptr _ptr_type;
-  typedef CORBA_NameValuePairSeq_var _var_type;
+  typedef NameValuePairSeq_ptr _ptr_type;
+  typedef NameValuePairSeq_var _var_type;
 #endif /* __GNUC__ */
   // Useful for template programming.
 
 };
 
+#endif /* end #if !defined */
+
+
+#if !defined (_NAMEVALUEPAIRSEQ___VAR_CH_)
+#define _NAMEVALUEPAIRSEQ___VAR_CH_
+
+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 +1040,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,6 +1064,13 @@ 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:
@@ -930,12 +1096,12 @@ 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 ()
      );
@@ -957,11 +1123,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 +1166,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,6 +1190,13 @@ 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:
@@ -1073,23 +1266,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 +1297,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 +1310,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 +1340,7 @@ public:
     return *this;
   }
 
-  ~_TAO_Unbounded_Sequence_CORBA_AnySeq (void) // Dtor.
+  ~_TAO_Unbounded_Sequence_AnySeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
@@ -1261,93 +1461,128 @@ public:
 
 };
 
+#endif /* end #if !defined */
+
+// Forward declarations.
+class AnySeq;
+typedef AnySeq *AnySeq_ptr;
+
+#if !defined (_ANYSEQ___VAR_CH_)
+#define _ANYSEQ___VAR_CH_
+
 // *************************************************************
-// class CORBA::AnySeq_var
+// class AnySeq_var
 // *************************************************************
 
-class  CORBA_AnySeq_var
+class  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;
+  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 CORBA_AnySeq &in (void) const;
-  CORBA_AnySeq &inout (void);
-  CORBA_AnySeq *&out (void);
-  CORBA_AnySeq *_retn (void);
-  CORBA_AnySeq *ptr (void) const;
+  const AnySeq &in (void) const;
+  AnySeq &inout (void);
+  AnySeq *&out (void);
+  AnySeq *_retn (void);
+  AnySeq *ptr (void) const;
 
 private:
-  CORBA_AnySeq *ptr_;
+  AnySeq *ptr_;
 };
 
-class  CORBA_AnySeq_out
+
+#endif /* end #if !defined */
+
+
+#if !defined (_ANYSEQ___OUT_CH_)
+#define _ANYSEQ___OUT_CH_
+
+class  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);
+  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:
-  CORBA_AnySeq *&ptr_;
+  AnySeq *&ptr_;
   // assignment from T_var not allowed
-  void operator= (const CORBA_AnySeq_var &);
+  void operator= (const AnySeq_var &);
 };
 
+
+#endif /* end #if !defined */
+
+#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
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_AnySeq_ptr _ptr_type;
-  typedef CORBA_AnySeq_var _var_type;
+  typedef AnySeq_ptr _ptr_type;
+  typedef AnySeq_var _var_type;
 #endif /* __GNUC__ */
 
 };
 
+#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 +1608,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,6 +1632,13 @@ 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:
@@ -1416,12 +1665,12 @@ 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 ()
      );
@@ -1443,11 +1692,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 +1735,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,6 +1759,13 @@ 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:
@@ -1507,12 +1783,12 @@ public:
     );
   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 ()
      );
@@ -1534,6 +1810,9 @@ private:
   void operator= (const CORBA_DynArray &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynArray;
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i
index d9edfe734ec..89dde7d1b3c 100644
--- a/TAO/tao/DynAnyC.i
+++ b/TAO/tao/DynAnyC.i
@@ -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);
 }
@@ -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);
 }
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
index 5ea22e3b1cf..8721d26763d 100644
--- a/TAO/tao/DynAnyS.cpp
+++ b/TAO/tao/DynAnyS.cpp
@@ -858,7 +858,7 @@ POA_CORBA::_tao_collocated_DynStruct::current_member_kind (
   );
 }
 
-CORBA::NameValuePairSeq *
+NameValuePairSeq *
 POA_CORBA::_tao_collocated_DynStruct::get_members (
     CORBA::Environment &_tao_environment
    )
@@ -870,7 +870,7 @@ POA_CORBA::_tao_collocated_DynStruct::get_members (
 
 void
 POA_CORBA::_tao_collocated_DynStruct::set_members (
-    const CORBA::NameValuePairSeq & value,
+    const NameValuePairSeq & value,
     CORBA::Environment &_tao_environment
    )
 {
@@ -1198,7 +1198,7 @@ POA_CORBA::_tao_collocated_DynSequence::length (
   );
 }
 
-CORBA_AnySeq *
+AnySeq *
 POA_CORBA::_tao_collocated_DynSequence::get_elements (
     CORBA::Environment &_tao_environment
    )
@@ -1210,7 +1210,7 @@ POA_CORBA::_tao_collocated_DynSequence::get_elements (
 
 void
 POA_CORBA::_tao_collocated_DynSequence::set_elements (
-    const CORBA_AnySeq & value,
+    const AnySeq & value,
     CORBA::Environment &_tao_environment
    )
 {
@@ -1326,7 +1326,7 @@ CORBA::Boolean POA_CORBA::_tao_collocated_DynArray::_is_a (
     );
 }
 
-CORBA_AnySeq *
+AnySeq *
 POA_CORBA::_tao_collocated_DynArray::get_elements (
     CORBA::Environment &_tao_environment
    )
@@ -1338,7 +1338,7 @@ POA_CORBA::_tao_collocated_DynArray::get_elements (
 
 void
 POA_CORBA::_tao_collocated_DynArray::set_elements (
-    const CORBA_AnySeq & value,
+    const AnySeq & value,
     CORBA::Environment &_tao_environment
    )
 {
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index 40ad77f82d9..8234be6f51e 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -53,7 +53,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,7 +103,7 @@ TAO_DynArray_i::~TAO_DynArray_i (void)
 ///////////////////////////////////////////////////////////////////////
 // Functions specific to DynArray
 
-CORBA_AnySeq_ptr
+AnySeq_ptr
 TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
@@ -113,10 +112,10 @@ 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),
+                    AnySeq (length),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -134,7 +133,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 }
 
 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,7 +230,6 @@ 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 ()))
@@ -282,7 +280,6 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   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);
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index e7ea518d0cc..f03e745669c 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -49,9 +49,9 @@ 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 &ACE_TRY_ENV);
 
-  void set_elements (const CORBA_AnySeq& value,
+  void set_elements (const AnySeq& value,
                      CORBA::Environment &ACE_TRY_ENV);
 
   // Functions common to all Dynamic Any types
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index fc9f81daa26..3df444c0a02 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -167,7 +167,6 @@ TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   CORBA_Any* retval;
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (this->type_.in (),
-                               0,
                                out_cdr.begin ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -219,202 +218,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,21 +426,21 @@ 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;
 }
 
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 27b8f39ac25..2fa61870277 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -57,7 +57,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,7 +112,7 @@ TAO_DynSequence_i::length (CORBA::ULong length,
   this->da_members_.size (length);
 }
 
-CORBA_AnySeq_ptr
+AnySeq_ptr
 TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
@@ -121,9 +120,9 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
   if (length == 0)
     return 0;
 
-  CORBA_AnySeq_ptr elements;
+  AnySeq_ptr elements;
   ACE_NEW_THROW_EX (elements,
-                    CORBA_AnySeq (length),
+                    AnySeq (length),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -141,7 +140,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 }
 
 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 +247,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 ()))
@@ -301,7 +299,6 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   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);
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index 3305fa14839..d22c8a060a4 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -56,9 +56,9 @@ public:
 
   // 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 &ACE_TRY_ENV);
 
-  void set_elements (const CORBA_AnySeq& value,
+  void set_elements (const AnySeq& value,
                      CORBA::Environment &ACE_TRY_ENV);
 
   // Functions common to all Dynamic Any types
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 668c4e9597d..24c833303b7 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -53,7 +53,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 +100,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,14 +115,14 @@ TAO_DynStruct_i::current_member_kind (CORBA::Environment& env)
                                 env);
 }
 
-CORBA::NameValuePairSeq*
+NameValuePairSeq*
 TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
-  CORBA::NameValuePairSeq* members;
+  NameValuePairSeq* members;
   ACE_NEW_THROW_EX (members,
-                    CORBA::NameValuePairSeq (length),
+                    NameValuePairSeq (length),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -144,7 +143,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
 }
 
 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 +232,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 ()))
@@ -284,7 +282,6 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   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);
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index e0d4d8758db..fa58914b68c 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -47,16 +47,16 @@ public:
 
   // Functions specific to DynStruct
 
-  CORBA::FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV);
+  FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV);
   // FieldName is IDL typedef for string
 
   CORBA::TCKind current_member_kind (CORBA::Environment &ACE_TRY_ENV);
 
   // Assign and dump elements using IDL defined type NameValuePairSeq
 
-  CORBA::NameValuePairSeq* get_members (CORBA::Environment &ACE_TRY_ENV);
+  NameValuePairSeq* get_members (CORBA::Environment &ACE_TRY_ENV);
 
-  void set_members (const CORBA::NameValuePairSeq& value,
+  void set_members (const NameValuePairSeq& value,
                     CORBA::Environment &ACE_TRY_ENV);
 
   // Functions common to all Dynamic Any types
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 36e8d7ad937..d1882cd0f86 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -256,9 +256,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   CORBA_Any* retval;
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (this->type (ACE_TRY_ENV),
-                               0,
                                in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
   return retval;
 }
@@ -1270,37 +1269,37 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
       case CORBA::tk_short:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::Short>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_long:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::Long>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_ushort:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::UShort>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_ulong:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::ULong>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_boolean:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::Boolean>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_char:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::Char>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
 
@@ -1309,7 +1308,7 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
       case CORBA::tk_longlong:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::LongLong>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
         ACE_CHECK_RETURN (0);
         return retval;
@@ -1318,19 +1317,19 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
       case CORBA::tk_ulonglong:
         ACE_NEW_THROW_EX (retval,
                           DU_Extractor<CORBA::ULongLong>,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_wchar:
         ACE_NEW_THROW_EX (retval,
                           WChar_extractor,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       case CORBA::tk_enum:
         ACE_NEW_THROW_EX (retval,
                           Enum_extractor,
-                          CORBA::NO_MEMORY ());
+                          CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
         ACE_CHECK_RETURN (0);
         return retval;
       default:
@@ -1352,7 +1351,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 +1407,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 ()))
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..298581a24d8 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -47,8 +47,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 +58,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)
 {
@@ -149,7 +127,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.
@@ -236,31 +220,3 @@ CORBA::Environment::print_exception (const char *info,
     ACE_DEBUG ((LM_ERROR,
                 "TAO: (%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..bbd6e0a9fc0 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -102,13 +102,8 @@ public:
   // = 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.
 
@@ -125,67 +120,6 @@ 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 (__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..de20b536ce9 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -318,7 +318,7 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
       || stream.encode (CORBA::_tc_TypeCode,
                         &CORBA::_tc_any, 0,
                         TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW (CORBA_INITIALIZE ());
+    TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO));
 
   tcp = new CORBA::TypeCode (CORBA::tk_except,
                              stream.length (),
@@ -374,7 +374,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
       || stream.encode (CORBA::_tc_TypeCode,
                         &TC_completion_status, 0,
                         TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW (CORBA_INITIALIZE ());
+    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
@@ -428,10 +428,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
     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 (TRANSACTION_MODE)
 
 // Declare static storage for these ... the buffer is "naturally"
 // aligned and overwritten.
@@ -531,7 +528,7 @@ STANDARD_EXCEPTION_LIST
 #define TAO_SYSTEM_EXCEPTION(name) \
 CORBA_##name :: CORBA_##name (void) \
   :  CORBA_SystemException (CORBA::_tc_ ## name, \
-                            TAO_DEFAULT_MINOR_CODE, \
+                            0xffff0000L, \
                             CORBA::COMPLETED_NO) \
 { \
 }
@@ -542,7 +539,6 @@ 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]);
@@ -586,7 +582,6 @@ CORBA_ExceptionList::item (CORBA::ULong index,
       return CORBA::TypeCode::_duplicate (*tc);
     }
 }
-
 void
 CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env)
 {
@@ -594,38 +589,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..d507b33c621 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -193,8 +193,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); \
@@ -233,9 +233,6 @@ 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 +307,6 @@ public:
   // list of system exceptions
 };
 
-
-class CORBA_ExceptionList;
-typedef CORBA_ExceptionList* CORBA_ExceptionList_ptr;
-
 class CORBA_ExceptionList
 {
   // = TITLE
@@ -336,12 +329,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
 
@@ -356,7 +343,6 @@ public:
 
 #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.
 
@@ -365,38 +351,10 @@ private:
   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/GIOP.cpp b/TAO/tao/GIOP.cpp
index e6ac6fd445a..278f33e6b2a 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -311,8 +311,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,
@@ -357,8 +356,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,
@@ -606,12 +604,10 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
 {
   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",
@@ -708,8 +704,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
@@ -781,7 +776,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..4c27a04b220 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -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..00120ece82b 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -39,9 +39,3 @@ 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..3ec94800e72 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -56,9 +56,6 @@ public:
   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.
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 871451d8ba2..8a6c4b6193c 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -68,7 +68,7 @@ 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
@@ -106,7 +106,7 @@ int
 TAO_IIOP_Connector::open (TAO_Resource_Factory *trf,
                           ACE_Reactor *reactor)
 {
-  // @@ Fred: why not just
+  // @ Fred: why not just
   //
   // return this->base_connector_.open (....); ????
   //
@@ -252,17 +252,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_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 4a767668f92..1ed766d0300 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -8,7 +8,6 @@
 #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$")
@@ -30,7 +29,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),
+    forward_to_ (0)
 {
   this->set(addr);
   int l = ACE_OS::strlen (object_key);
@@ -53,7 +53,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),
+    forward_to_ (0)
 {
   this->set(addr);
   this->create_body ();
@@ -71,7 +72,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),
+    forward_to_ (0)
 {
   this->set(addr);
   int l = ACE_OS::strlen (object_key);
@@ -95,7 +97,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),
+    forward_to_ (0)
 {
   this->set(addr);
   this->create_body ();
@@ -113,7 +116,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (port, host),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    forward_to_ (0)
 {
 
   if (host)
@@ -139,7 +143,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    forward_to_ (0)
 {
 
   if (host)
@@ -165,7 +170,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (port, host),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    forward_to_ (0)
 {
   ACE_UNUSED_ARG (version);
 
@@ -186,7 +192,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),
+    forward_to_ (0)
 {
 
   ACE_NEW (this->host_,
@@ -206,7 +213,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),
+    forward_to_ (0)
 {
 
   ACE_NEW (this->host_,
@@ -226,7 +234,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IOP_Version &version)
     object_addr_ (),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    forward_to_ (0)
 {
 }
 
@@ -240,7 +249,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),
+    forward_to_ (0)
 {
   parse_string (string, env);
 }
@@ -255,7 +265,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (void)
     object_addr_ (),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    forward_to_ (0)
 {
 }
 
@@ -297,6 +308,12 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
 
   delete [] this->host_;
   this->host_ = 0;
+
+  if (forward_to_)
+    {
+      delete forward_to_;
+    }
+
 }
 
 // return codes:
@@ -389,12 +406,12 @@ TAO_IIOP_Profile::parse_string (const char *string,
       string += 5;
     }
   else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), 0);
 
   if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR
       || this->version_.minor  > TAO_IIOP_Profile::DEF_IIOP_MINOR)
     {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1);
     }
 
   // Pull off the "hostname:port/" part of the objref
@@ -405,8 +422,8 @@ TAO_IIOP_Profile::parse_string (const char *string,
   char *cp = ACE_OS::strchr (start, ':');
 
   if (cp == 0)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
+    { 
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1);
     }
 
   if (this->host_)
@@ -435,7 +452,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
   if (cp == 0)
     {
       CORBA::string_free (this->host_);
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1);
     }
 
   this->port_ = (CORBA::UShort) ACE_OS::atoi (start);
@@ -625,6 +642,30 @@ TAO_IIOP_Profile::_decr_refcnt (void)
   return 0;
 }
 
+
+void
+TAO_IIOP_Profile::forward_to (TAO_MProfile *mprofiles)
+{
+  // we assume ownership of the profile list!!
+  if (forward_to_)
+    delete this->forward_to_;
+
+  ACE_NEW (this->forward_to_,
+           TAO_MProfile (mprofiles));
+
+}
+
+TAO_MProfile *
+TAO_IIOP_Profile::forward_to (void)
+{
+  TAO_MProfile *temp;
+
+  ACE_NEW_RETURN (temp,
+                  TAO_MProfile (this->forward_to_),
+                  0);
+  return temp;
+}
+
 CORBA::String
 TAO_IIOP_Profile::to_string (CORBA::Environment &env)
 {
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 3a1081cb597..c0b43377418 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -140,6 +140,12 @@ public:
   TAO_ObjectKey *_key (CORBA::Environment &env);
   //  Return a pointer to the Object Key.
 
+  virtual void forward_to (TAO_MProfile *mprofiles);
+  // Client object will assume ownership for this object!!
+
+  virtual TAO_MProfile *forward_to (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
@@ -201,6 +207,11 @@ private:
   int set (const ACE_INET_Addr &addr);
   // helper method to set the INET_Addr.
 
+  virtual TAO_MProfile *forward_to_i (void);
+  // reference to the TAO_MProfile which the current profile was
+  // forwarded to.  This object keeps ownership.  Note that this
+  // method is NOT thread-safe, so it must be called with locks held.
+
   void create_body (void);
   // Does the work for <add_profile>.
 
@@ -237,6 +248,9 @@ private:
 
   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__)
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
index 4b14f5bf659..21c5eb77d89 100644
--- a/TAO/tao/IIOP_Profile.i
+++ b/TAO/tao/IIOP_Profile.i
@@ -79,3 +79,9 @@ TAO_IIOP_Profile::_nil (void)
 {
   return (TAO_IIOP_Profile *)0;
 }
+
+ACE_INLINE TAO_MProfile *
+TAO_IIOP_Profile::forward_to_i (void)
+{
+  return this->forward_to_;
+}
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index fa7a726abb0..a8e610e14f7 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -117,7 +117,7 @@ TAO_IIOP_Transport::_nil (void)
 void
 TAO_IIOP_Transport::resume_connection (ACE_Reactor *reactor)
 {
-  this->handler_->resume_handler (reactor);
+  (void) reactor->resume_handler (this->handler_);
 }
 
 void
@@ -161,7 +161,8 @@ TAO_IIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
 
   // @@ Fred, this should NOT be a local constant...  It should use a
   // macro defined in OS.h...
-  iovec iov[IOV_MAX];
+  const int TAO_WRITEV_MAX = 16;
+  iovec iov[TAO_WRITEV_MAX];
   int iovcnt = 0;
   ssize_t n = 0;
   ssize_t nbytes = 0;
@@ -182,8 +183,8 @@ TAO_IIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
           // 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)
+          // we should set TAO_WRITEV_MAX to that limit.
+          if (iovcnt == TAO_WRITEV_MAX)
             {
               n = this->handler_->peer ().sendv_n ((const iovec *) iov,
                                                    iovcnt);
diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/tao/IOR_LookupTable.cpp
index 5ed31afa4b0..728dc0cfe0f 100644
--- a/TAO/tao/IOR_LookupTable.cpp
+++ b/TAO/tao/IOR_LookupTable.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
-#include "tao/IOR_LookupTable.h"
-#include "tao/debug.h"
+#include "IOR_LookupTable.h"
 
 ACE_RCSID(tao, IOR_TableLookup, "$Id$")
 
@@ -33,23 +32,20 @@ TAO_IOR_LookupTable::add_ior (ACE_CString &object_name,
   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"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Object Name already exists in the 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;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Unable to bind in IOR_LookupTable::add_ior ()"),
+                        -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 ()));
-
+  ACE_DEBUG ((LM_DEBUG,
+	      "\n%s:%s Added to the IOR table\n",
+	      object_name.c_str (),
+	      ior.c_str ()));
+  
   return 0;
 }
 
@@ -61,11 +57,6 @@ TAO_IOR_LookupTable::find_ior (ACE_CString &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);
 
 }
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index b103f7aebfb..6ed2a39af01 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -5,7 +5,6 @@
 #include "tao/Principal.h"
 
 #include "tao/Timeprobe.h"
-#include "tao/Object_KeyC.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
@@ -135,14 +134,14 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
   // assert (this->stub_ != 0);
 
   if (this->stub_ == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW (CORBA::INV_OBJREF (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 ());
+    ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // @@ It seems like this is the right spot to re-order the profiles
   // based on the policies in the ORB.
@@ -171,7 +170,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
       // 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 ());
+        ACE_THROW (CORBA::TRANSIENT (CORBA::COMPLETED_NO));
     }
 
   const TAO_ObjectKey& key = this->profile_->object_key();
@@ -201,7 +200,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
   if (TAO_GIOP::start_message (message_type,
                                this->out_stream_,
                                this->orb_core_) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG);
 
@@ -243,11 +242,11 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
       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);
 }
@@ -322,7 +321,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
 {
 
   if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
+    ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO),
                       TAO_INVOKE_EXCEPTION);
 
   int result =
@@ -417,7 +416,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
       // @@ 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 (),
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -434,7 +433,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
       // @@ 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 (),
+      ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -451,7 +450,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
   // New for Multiple profile.  Get the MProfile list from the
   // forwarded object refererence
 
-  this->stub_->add_forward_profiles (*stubobj->get_profiles ());
+  this->stub_->add_forward_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
@@ -464,7 +463,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
   // 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 (),
+    ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_NO),
                       TAO_INVOKE_EXCEPTION);
 
   return TAO_INVOKE_RESTART;
@@ -500,7 +499,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
           //    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),
+          ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES),
                             TAO_INVOKE_EXCEPTION);
         }
 
@@ -526,11 +525,11 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
 
           const ACE_Message_Block* cdr =
             this->inp_stream_.start ();
-          CORBA_Any any (tcp, 0, cdr);
+          CORBA_Any any (tcp, cdr);
           CORBA_Exception *exception;
           ACE_NEW_THROW_EX (exception,
                             CORBA_UnknownUserException (any),
-                            CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+                            CORBA::NO_MEMORY (CORBA::COMPLETED_YES));
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           // @@ Think about a better way to raise the exception here,
@@ -545,7 +544,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
       // @@ 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),
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -586,7 +585,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
           //    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),
+          ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES),
                             TAO_INVOKE_EXCEPTION);
         }
 
@@ -605,7 +604,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
           CORBA::Exception_ptr exception = excepts[i].alloc ();
 
           if (exception == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_YES),
                               TAO_INVOKE_EXCEPTION);
 
           this->inp_stream_.decode (exception->_type (),
@@ -627,7 +626,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
       // 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),
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -736,7 +735,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
       // invocation may perfectly work.
       this->close_connection ();
 
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -781,7 +780,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
       //    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),
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -796,7 +795,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
       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),
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -849,7 +848,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
             //    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),
+            ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE),
                               TAO_INVOKE_EXCEPTION);
           }
 
@@ -903,7 +902,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
   //    to refactor them.
 
   if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
+    ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO),
                       TAO_INVOKE_EXCEPTION);
 
   int result =
@@ -923,7 +922,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
       //    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),
+      ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -985,7 +984,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
 
       this->close_connection ();
 
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -1004,7 +1003,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
       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),
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -1014,7 +1013,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
       break;
 
     case TAO_GIOP_UNKNOWN_OBJECT:
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_YES),
                         TAO_INVOKE_EXCEPTION);
       // NOTREACHED
 
diff --git a/TAO/tao/Key_Adapters.h b/TAO/tao/Key_Adapters.h
index 793dad8976a..9994c8878ee 100644
--- a/TAO/tao/Key_Adapters.h
+++ b/TAO/tao/Key_Adapters.h
@@ -110,6 +110,16 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
+// Comparison of Object Ids. 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);
+
+extern TAO_Export int operator!= (const PortableServer::ObjectId &l,
+                                  const PortableServer::ObjectId &r);
+
+////////////////////////////////////////////////////////////////////////////////
+
 #if defined (__ACE_INLINE__)
 # include "tao/Key_Adapters.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index eaa6d0ca69e..963f4becb77 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -10,42 +10,50 @@ ACE_RCSID(tao, MProfile, "$Id$")
 # include "tao/MProfile.i"
 #endif /* __ACE_INLINE__ */
 
-void
-TAO_MProfile::cleanup (void)
-{
-  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->current_ = 0;
-  this->size_ = 0;
-  this->last_ = 0;
-}
-
 int
 TAO_MProfile::set (CORBA::ULong sz)
 {
   if (sz == 0)
     {
-      this->cleanup ();
+      // 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;
+          }
+
+      if (this->size_)
+        delete [] this->pfiles_;
+  
+      if (forward_from_)
+        delete forward_from_;
+  
+      pfiles_ = 0;
+      current_ = 0;
+      size_ = 0;
+      last_= 0;
+
+      this->pfiles_ = 0;
+      this->current_ = 0;
+      this->size_ = 0;
+      this->last_= 0;
+
       return 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_)
     {
       // Release all of our profiles.
 
       for (TAO_PHandle h = 0;
-           h < this->size_;
+           h < size_;
            h++)
         if (this->pfiles_[h])
           {
@@ -53,13 +61,10 @@ TAO_MProfile::set (CORBA::ULong sz)
             this->pfiles_[h] = 0;
           }
 
-      // Next see if we can reuse our profile list memory
+      // 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_,
@@ -72,40 +77,36 @@ TAO_MProfile::set (CORBA::ULong sz)
     ACE_NEW_RETURN (this->pfiles_,
                     TAO_Profile_ptr [sz],
                     -1);
+  // this->pfiles_
 
-  this->size_ = sz;
-  this->last_ = 0;
-  this->current_ = 0;
-
-#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
+  size_ = sz;
+  this->last_ = 0;
+  this->current_ = 0;
 
   // @@ since we are being reset, get rid of forward references!
-  // if (forward_from_)
-  // delete forward_from_;
+  if (forward_from_)
+    delete forward_from_;
 
-  return this->size_;
+  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 == 0)
+    return this->set ((CORBA::ULong) 0);
+
+  this->set (mprofile->last_);
 
   // set indexes ...
-  this->last_ = mprofile.last_;
+  this->last_ = mprofile->last_;
 
   // These are set in set (ULong);
   // this->current_ = 0;
@@ -113,73 +114,17 @@ TAO_MProfile::set (const TAO_MProfile &mprofile)
 
   // Now reference all profiles.
 
-  for (TAO_PHandle h = 0; h < this->size_; h++)
-    {
-      this->pfiles_[h] = mprofile.pfiles_[h];
-      if (this->pfiles_[h] != 0)
+  for (TAO_PHandle h = 0;
+       h < this->size_;
+       h++)
+    if (mprofile->pfiles_[h])
+      {
+        this->pfiles_[h] = mprofile->pfiles_[h];
         this->pfiles_[h]->_incr_refcnt ();
-    }
+      }
 
-  //
-  // @@ 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_;
+  if (mprofile->forward_from_)
+    this->forward_from_ = mprofile->forward_from_;
 
   return 1;
 }
-
-int
-TAO_MProfile::add_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    return -1;
-
-  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"),
-                      -1);
-  return last_ - 1;
-}
-
-CORBA::Boolean
-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!!
-  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;
-}
-
-CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &env)
-{
-  CORBA::ULong hashval = 0;
-
-  if (last_ == 0)
-    return 0;
-
-  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_;
-}
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 5222d785c63..2248e27cc04 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -21,11 +21,8 @@
 #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
+class TAO_Profile;
 typedef TAO_Profile *TAO_Profile_ptr;
 typedef CORBA::ULong TAO_PHandle;
 
@@ -47,24 +44,17 @@ public:
   // = Initalization and termination methods.
   TAO_MProfile (CORBA::ULong sz);
 
-  TAO_MProfile (const TAO_MProfile &mprofiles);
+  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!!
@@ -129,16 +119,15 @@ public:
                      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!
 
-
-private:
-  void cleanup (void);
-  // Helper method to implement the destructor
-
 private:
 
   TAO_MProfile  *forward_from_;
@@ -166,4 +155,5 @@ private:
 # include "tao/MProfile.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_MPROFILE_H */
+// @@ Fred, please don't use #endif // ..., instead, always use #endif /* ... */
+#endif // TAO_MPROFILE_H
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index a4291144f82..2f6c3d36c4f 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -1,6 +1,9 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+#include "tao/MProfile.h"
+#include "tao/Pluggable.h"
+
 ACE_INLINE
 TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
   :  forward_from_(0),
@@ -13,7 +16,7 @@ TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
 }
 
 ACE_INLINE
-TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
+TAO_MProfile::TAO_MProfile (TAO_MProfile *mprofiles)
   :  forward_from_(0),
      pfiles_ (0),
      current_ (0),
@@ -23,20 +26,17 @@ TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
   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 ();
+ {
+  if (this->pfiles_)
+    for (TAO_PHandle h = 0; h < last_; 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.
@@ -132,6 +132,22 @@ TAO_MProfile::rewind (void)
 }
 
 ACE_INLINE int
+TAO_MProfile::add_profile (TAO_Profile *pfile)
+{
+  // skip by the used slots
+  if (last_ == size_) // full!
+    return -1;
+
+  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"),
+                      -1);
+  return last_ - 1;
+}
+
+ACE_INLINE int
 TAO_MProfile::give_profile (TAO_Profile *pfile)
 {
   // skip by the used slots
@@ -176,3 +192,40 @@ TAO_MProfile::pfiles (void) const
 {
   return this->pfiles_;
 }
+
+ACE_INLINE CORBA::Boolean
+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!!
+  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;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &env)
+{
+  CORBA::ULong hashval = 0;
+
+  if (last_ == 0)
+    return 0;
+
+  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_;
+}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 1fff6534950..c08e7aa50bc 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -17,8 +17,7 @@ PUB_HDRS = \
   IIOP_Profile \
   IIOP_Transport \
   IIOP_Connector \
-  IIOP_Acceptor \
-  GIOP \
+  IIOP_Acceptor GIOP \
   Invocation \
   Connect \
   Params \
@@ -49,8 +48,7 @@ PLUGGABLE_PROTOCOLS_FILES = \
 
 DEFAULT_RESOURCES_FILES = \
   default_client \
-  default_server \
-  default_resource
+  default_server
 
 INTERPRETIVE_MARSHALING_FILES = \
   append \
@@ -70,16 +68,13 @@ ORB_CORE_FILES = \
   Any \
   CurrentC \
   CurrentS \
+  Context \
   Exception \
-  WrongTransactionC \
   Environment \
   Object \
   ORB \
-  corbafwd \
   PolicyC \
   PolicyS \
-  DomainC \
-  DomainS \
   TimeBaseC \
   TimeBaseS \
   Principal \
@@ -88,20 +83,15 @@ ORB_CORE_FILES = \
   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 \
@@ -120,11 +110,8 @@ POA_FILES += \
   Forwarding_Servant
 
 ORB_CORE_FILES += \
-  Context \
   Request \
-  Services \
-  NVList \
-  ObjectIDList
+  NVList
 
 DYNAMIC_ANY_FILES += \
   DynAnyC \
@@ -324,7 +311,6 @@ 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 \
@@ -383,6 +369,9 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -456,8 +445,16 @@ realclean:
  $(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/ORB_Core.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_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/IIOP_Acceptor.h \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
@@ -466,34 +463,18 @@ realclean:
  $(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/Active_Object_Map.i \
  $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.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 \
@@ -573,7 +554,6 @@ 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 \
@@ -632,6 +612,9 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -742,7 +725,6 @@ 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 \
@@ -753,6 +735,9 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -769,14 +754,7 @@ realclean:
  $(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 \
@@ -870,11 +848,7 @@ realclean:
  $(TAO_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 \
@@ -882,10 +856,13 @@ realclean:
  $(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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/POA.i \
  $(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 \
@@ -957,7 +934,6 @@ 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 \
@@ -968,22 +944,6 @@ realclean:
  $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1012,12 +972,24 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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/Object_KeyC.h \
@@ -1112,12 +1084,7 @@ realclean:
  $(TAO_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 \
@@ -1125,10 +1092,14 @@ realclean:
  $(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/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.i \
@@ -1207,7 +1178,6 @@ 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 \
@@ -1218,21 +1188,6 @@ realclean:
  $(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/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 \
@@ -1261,12 +1216,23 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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/POAS.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1279,29 +1245,13 @@ realclean:
  $(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/Strategies_T.h \
+ $(ACE_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 \
@@ -1309,9 +1259,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 \
@@ -1342,7 +1305,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 \
@@ -1350,21 +1312,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/POA.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.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/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 \
+ $(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 \
@@ -1381,9 +1368,14 @@ 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/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 \
@@ -1391,85 +1383,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/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/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 \
@@ -1481,47 +1422,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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/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 \
@@ -1530,14 +1444,33 @@ 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/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/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 \
@@ -1553,13 +1486,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 \
@@ -1573,14 +1503,85 @@ 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/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 \
+ $(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/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/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/POA.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 .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 \
@@ -1649,7 +1650,6 @@ 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 \
@@ -1708,6 +1708,9 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -1854,7 +1857,6 @@ 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 \
@@ -1869,19 +1871,8 @@ realclean:
  $(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.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Operation_Table.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 \
@@ -1908,45 +1899,31 @@ realclean:
  $(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)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(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/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/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/Strategies_T.h \
+ $(ACE_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 \
@@ -1954,9 +1931,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 \
@@ -1987,7 +1977,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 \
@@ -1995,13 +1984,14 @@ realclean:
  $(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/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/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -2024,6 +2014,8 @@ realclean:
  $(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 \
@@ -2031,6 +2023,11 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.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/MProfile.i \
@@ -2107,7 +2104,6 @@ realclean:
  $(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/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
@@ -2122,16 +2118,6 @@ realclean:
  $(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.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -2160,9 +2146,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/Managed_Types.i \
+ $(TAO_ROOT)/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/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2238,14 +2232,14 @@ 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/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(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 \
@@ -2273,7 +2267,11 @@ 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/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 \
@@ -2281,12 +2279,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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/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 \
@@ -2360,28 +2352,13 @@ 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/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/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/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_KeyC.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 \
@@ -2410,55 +2387,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/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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.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/Strategies_T.h \
+ $(ACE_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 \
@@ -2466,9 +2418,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 \
@@ -2501,13 +2469,24 @@ realclean:
  $(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/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/PolicyC.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/Key_Adapters.h \
@@ -2528,6 +2507,8 @@ realclean:
  $(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 \
@@ -2535,6 +2516,11 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(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 \
@@ -2604,18 +2590,31 @@ 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/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.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 \
+ $(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 \
@@ -2625,14 +2624,16 @@ 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/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/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -2648,16 +2649,6 @@ 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 \
@@ -2858,8 +2849,10 @@ 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/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 \
@@ -2871,6 +2864,9 @@ realclean:
  $(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/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -2884,39 +2880,57 @@ realclean:
  $(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/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/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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
@@ -3072,13 +3086,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/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 \
  $(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/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 \
@@ -3238,63 +3257,88 @@ 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/default_client.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/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/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/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/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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
@@ -3365,7 +3409,6 @@ 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 \
@@ -3461,225 +3504,20 @@ realclean:
  $(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 \
- $(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 \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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 \
- $(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 \
  $(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/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/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/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -3689,21 +3527,18 @@ realclean:
  $(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 \
+ $(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.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
@@ -3712,14 +3547,7 @@ realclean:
  $(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 \
@@ -3741,9 +3569,6 @@ realclean:
  $(ACE_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 \
@@ -3751,29 +3576,12 @@ realclean:
  $(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/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/default_server.i
 .obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -3841,19 +3649,10 @@ 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 \
@@ -3882,7 +3681,15 @@ 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/ORB.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/Managed_Types.i \
@@ -3890,10 +3697,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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/decode.o .obj/decode.so .shobj/decode.o .shobj/decode.so: decode.cpp \
@@ -3963,19 +3766,10 @@ 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 \
@@ -4004,7 +3798,13 @@ 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/ORB.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/Managed_Types.i \
@@ -4012,17 +3812,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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/Any.h \
+ $(TAO_ROOT)/tao/Any.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/Pluggable.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/varout.h \
@@ -4030,45 +3829,13 @@ realclean:
  $(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/Strategies_T.h \
+ $(ACE_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 \
@@ -4076,9 +3843,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 \
@@ -4115,8 +3898,53 @@ 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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
@@ -4187,19 +4015,10 @@ 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 \
@@ -4228,24 +4047,26 @@ 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/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/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/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 \
@@ -4318,19 +4139,10 @@ 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 \
@@ -4359,24 +4171,26 @@ 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/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/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/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 \
@@ -4449,8 +4263,38 @@ 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/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/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -4460,16 +4304,14 @@ realclean:
  $(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/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Union.h
@@ -4540,19 +4382,10 @@ 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 \
@@ -4581,21 +4414,16 @@ 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/singletons.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp
+ $(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
 .obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -4663,19 +4491,10 @@ 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 \
@@ -4704,7 +4523,11 @@ 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/ORB.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/Managed_Types.i \
@@ -4712,11 +4535,11 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.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 \
@@ -4785,8 +4608,6 @@ 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/Managed_Types.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -4817,14 +4638,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/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_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.i \
+ $(TAO_ROOT)/tao/Managed_Types.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 \
@@ -4891,8 +4706,7 @@ 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
+ $(ACE_ROOT)/ace/CORBA_macros.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 \
@@ -4989,22 +4803,12 @@ 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/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
 .obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
  $(TAO_ROOT)/tao/Any.h \
@@ -5074,7 +4878,6 @@ 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 \
@@ -5082,8 +4885,6 @@ realclean:
  $(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 \
@@ -5114,17 +4915,10 @@ 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/Marshal.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
@@ -5193,17 +4987,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/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/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/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 \
@@ -5231,24 +5025,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/Stub.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(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 \
@@ -5258,9 +5048,7 @@ realclean:
  $(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
+ $(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 \
@@ -5329,7 +5117,6 @@ 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/Operation_Table.h \
@@ -5372,6 +5159,9 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
@@ -5383,14 +5173,7 @@ realclean:
  $(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 \
@@ -5401,8 +5184,8 @@ realclean:
  $(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 \
+.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
+ $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -5468,19 +5251,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/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/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/Context.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 \
@@ -5546,9 +5319,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/Exception.h \
- $(TAO_ROOT)/tao/Exception.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/Any.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 \
@@ -5616,48 +5395,11 @@ 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/Managed_Types.i \
- $(TAO_ROOT)/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 \
@@ -5674,38 +5416,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 \
@@ -5713,9 +5437,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 \
@@ -5746,7 +5486,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 \
@@ -5754,8 +5497,69 @@ 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/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/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
@@ -5826,16 +5630,19 @@ 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/ORB.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5863,27 +5670,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/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/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/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.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 \
@@ -5893,8 +5693,6 @@ realclean:
  $(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 \
@@ -5910,37 +5708,13 @@ realclean:
  $(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/Strategies_T.h \
+ $(ACE_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 \
@@ -5948,9 +5722,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 \
@@ -5983,8 +5773,43 @@ 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/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/params.h \
  $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -6060,7 +5885,6 @@ 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/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
@@ -6090,15 +5914,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 \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -6126,6 +5941,7 @@ realclean:
  $(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 \
@@ -6136,12 +5952,15 @@ realclean:
  $(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 \
  $(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/IIOP_Profile.i \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -6149,46 +5968,44 @@ realclean:
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(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/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/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/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/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 \
@@ -6217,18 +6034,11 @@ realclean:
  $(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/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 \
@@ -6246,91 +6056,27 @@ realclean:
  $(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/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/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(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/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
-.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/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
 .obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
@@ -6400,7 +6146,6 @@ 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 \
@@ -6411,17 +6156,6 @@ realclean:
  $(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/Stub.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 \
@@ -6450,9 +6184,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/Managed_Types.i \
+ $(TAO_ROOT)/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/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/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -6465,36 +6207,15 @@ realclean:
  $(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/Strategies_T.h \
+ $(ACE_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 \
@@ -6502,9 +6223,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 \
@@ -6541,8 +6278,42 @@ 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/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -6618,148 +6389,6 @@ 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/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/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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/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/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 \
@@ -6770,22 +6399,6 @@ realclean:
  $(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.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 \
@@ -6814,220 +6427,14 @@ 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/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/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 \
- $(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/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/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/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 \
@@ -7039,13 +6446,11 @@ realclean:
  $(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/Any.h \
+ $(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/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
@@ -7118,7 +6523,6 @@ 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 \
@@ -7126,8 +6530,6 @@ realclean:
  $(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
@@ -7199,7 +6601,6 @@ 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 \
@@ -7207,8 +6608,6 @@ realclean:
  $(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_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
 .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
@@ -7278,16 +6677,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/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/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/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 \
@@ -7357,8 +6784,38 @@ 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/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/ORB.i \
  $(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 \
@@ -7428,49 +6885,12 @@ 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/CDR.h \
- $(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/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 \
@@ -7498,36 +6918,44 @@ 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/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 \
+ $(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/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/Strategies_T.h \
+ $(ACE_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 \
@@ -7535,9 +6963,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 \
@@ -7568,7 +7012,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 \
@@ -7576,8 +7019,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/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/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -7650,10 +7130,12 @@ 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/MProfile.i \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.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 \
@@ -7722,13 +7204,13 @@ 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/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/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 \
@@ -7756,7 +7238,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/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -7764,9 +7247,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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 \
@@ -7774,8 +7254,6 @@ realclean:
  $(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 \
@@ -7783,45 +7261,13 @@ realclean:
  $(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 \
- $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_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 \
@@ -7829,9 +7275,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 \
@@ -7868,8 +7330,53 @@ 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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -7948,7 +7455,6 @@ 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/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Environment.h \
@@ -7956,90 +7462,11 @@ realclean:
  $(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/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/debug.h
-.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/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/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/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -8068,300 +7495,11 @@ 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/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/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/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 \
- $(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/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 \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/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 \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/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/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
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/debug.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 \
@@ -8431,48 +7569,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/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/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 +7594,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 +7615,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 +7666,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,8 +7673,67 @@ 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/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/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -8729,7 +7892,6 @@ 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
 .obj/Connect.o .obj/Connect.so .shobj/Connect.o .shobj/Connect.so: Connect.cpp \
  $(TAO_ROOT)/tao/Connect.h \
@@ -8882,63 +8044,37 @@ 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/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/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,13 +8084,24 @@ 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/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.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/Key_Adapters.h \
@@ -8975,13 +8122,20 @@ realclean:
  $(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/POA.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 .obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -9048,8 +8202,7 @@ 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
+ $(ACE_ROOT)/ace/CORBA_macros.h
 .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 \
@@ -9117,121 +8270,11 @@ 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/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 \
- $(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/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/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/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/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.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 \
@@ -9259,92 +8302,14 @@ 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/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/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/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 \
+ $(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/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 \
@@ -9410,50 +8375,11 @@ 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/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/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 \
@@ -9481,36 +8407,29 @@ 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/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 \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/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/Typecode.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/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 \
@@ -9518,9 +8437,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 \
@@ -9550,8 +8487,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 \
@@ -9559,13 +8494,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/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/PolicyC.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/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.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
+ $(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 \
@@ -9634,48 +8616,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/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/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 \
@@ -9692,38 +8641,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 +8662,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 \
@@ -9764,7 +8713,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 \
@@ -9772,8 +8720,67 @@ 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/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/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -9787,13 +8794,12 @@ realclean:
  $(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
+ $(ACE_ROOT)/ace/Timeprobe.h
 .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/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 \
@@ -9810,29 +8816,31 @@ realclean:
  $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_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/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 \
@@ -9842,68 +8850,15 @@ 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/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/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 \
- $(ACE_ROOT)/ace/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.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/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 \
@@ -9915,38 +8870,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 +8891,38 @@ 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 \
+ $(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/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 \
@@ -9987,7 +8953,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 \
@@ -9995,29 +8964,36 @@ realclean:
  $(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/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/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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 \
@@ -10039,6 +9015,9 @@ realclean:
  $(ACE_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 \
@@ -10046,7 +9025,38 @@ realclean:
  $(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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(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/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/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 \
@@ -10119,7 +9129,6 @@ 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 \
@@ -10148,173 +9157,6 @@ realclean:
  $(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 \
- $(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/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/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/Synch_T.i \
- $(ACE_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.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/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/Message_Block.i \
- $(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 \
@@ -10467,7 +9309,6 @@ 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/params.h \
  $(TAO_ROOT)/tao/params.i
@@ -10538,7 +9379,6 @@ 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/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -10635,66 +9475,50 @@ realclean:
  $(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/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/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/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/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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_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 \
@@ -10723,7 +9547,15 @@ realclean:
  $(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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.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
 .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 \
@@ -10792,7 +9624,6 @@ 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/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -10823,7 +9654,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/ORB.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -10831,9 +9663,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
@@ -10844,19 +9673,8 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/PolicyC.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 \
@@ -10947,9 +9765,7 @@ 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/debug.h
+ $(ACE_ROOT)/ace/CORBA_macros.h
 .obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -11017,7 +9833,6 @@ 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 \
@@ -11032,129 +9847,6 @@ realclean:
  $(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/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
- $(TAO_ROOT)/tao/Context.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/Context.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/NVList.h \
- $(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/NVList.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -11183,16 +9875,16 @@ 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/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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.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 \
@@ -11260,7 +9952,6 @@ realclean:
  $(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/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -11271,23 +9962,13 @@ realclean:
  $(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/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 \
@@ -11318,98 +9999,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/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 \
- $(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 \
- $(TAO_ROOT)/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 \
@@ -11479,7 +10070,6 @@ realclean:
  $(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 \
@@ -11487,8 +10077,6 @@ realclean:
  $(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 \
@@ -11519,297 +10107,13 @@ 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 \
+.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp \
+ $(TAO_ROOT)/tao/MessagingC.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/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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -11819,16 +10123,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 \
@@ -11873,8 +10173,8 @@ 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 \
@@ -11884,32 +10184,16 @@ realclean:
  $(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/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -11938,51 +10222,46 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(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/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/Strategies_T.h \
+ $(ACE_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 \
@@ -11990,9 +10269,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 \
@@ -12029,8 +10324,42 @@ 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/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/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -12038,7 +10367,15 @@ realclean:
  $(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/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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -12048,21 +10385,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/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 \
@@ -12107,8 +10435,8 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -12116,8 +10444,6 @@ realclean:
  $(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 \
@@ -12126,17 +10452,12 @@ realclean:
  $(TAO_ROOT)/tao/TimeBaseS.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/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/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 \
@@ -12165,12 +10486,15 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -12178,6 +10502,9 @@ realclean:
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Singleton.h \
@@ -12190,7 +10517,14 @@ realclean:
  $(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 \
+ $(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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -12200,20 +10534,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/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 \
@@ -12258,8 +10584,8 @@ 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/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
@@ -12271,17 +10597,6 @@ realclean:
  $(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 \
@@ -12310,12 +10625,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -12388,7 +10710,6 @@ realclean:
  $(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 \
@@ -12398,8 +10719,6 @@ realclean:
  $(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 \
@@ -12429,7 +10748,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/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 \
@@ -12437,12 +10758,9 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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 \
@@ -12457,9 +10775,7 @@ realclean:
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.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/orbconf.h \
@@ -12527,7 +10843,6 @@ realclean:
  $(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 \
@@ -12537,8 +10852,6 @@ realclean:
  $(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 \
@@ -12568,7 +10881,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/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 \
@@ -12576,16 +10891,12 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_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 \
@@ -12657,7 +10968,6 @@ realclean:
  $(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 \
@@ -12672,17 +10982,6 @@ realclean:
  $(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 \
@@ -12711,12 +11010,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -12796,7 +11102,6 @@ realclean:
  $(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 \
@@ -12811,17 +11116,6 @@ realclean:
  $(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 \
@@ -12850,12 +11144,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -12929,7 +11230,6 @@ realclean:
  $(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 \
@@ -12944,17 +11244,6 @@ realclean:
  $(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 \
@@ -12983,12 +11272,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -13062,7 +11358,6 @@ realclean:
  $(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 \
@@ -13077,17 +11372,6 @@ realclean:
  $(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 \
@@ -13116,12 +11400,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -13195,7 +11486,6 @@ realclean:
  $(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 \
@@ -13210,17 +11500,6 @@ realclean:
  $(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 \
@@ -13249,12 +11528,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -13328,7 +11614,6 @@ realclean:
  $(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 \
@@ -13343,17 +11628,6 @@ realclean:
  $(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 \
@@ -13382,12 +11656,19 @@ 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/Managed_Types.i \
+ $(TAO_ROOT)/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/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 \
@@ -13464,7 +11745,6 @@ realclean:
  $(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/Exception.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
@@ -13494,15 +11774,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
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index e780ab7cbf6..217037e1781 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -9,9 +9,6 @@
 //                 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"
@@ -204,7 +201,7 @@ Messaging::RebindMode Messaging::RebindPolicy::rebind_mode (
 {
     Messaging::RebindMode _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -276,7 +273,7 @@ Messaging::SyncScope Messaging::SyncScopePolicy::synchronization (
 {
     Messaging::SyncScope _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -375,10 +372,8 @@ Messaging::PriorityRange Messaging::RequestPriorityPolicy::priority_range (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -449,10 +444,8 @@ Messaging::PriorityRange Messaging::ReplyPriorityPolicy::priority_range (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -523,12 +516,8 @@ TimeBase::UtcT Messaging::RequestStartTimePolicy::start_time (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -599,12 +588,8 @@ TimeBase::UtcT Messaging::RequestEndTimePolicy::end_time (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -675,12 +660,8 @@ TimeBase::UtcT Messaging::ReplyStartTimePolicy::start_time (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -751,12 +732,8 @@ TimeBase::UtcT Messaging::ReplyEndTimePolicy::end_time (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -828,7 +805,7 @@ TimeBase::TimeT Messaging::RelativeRequestTimeoutPolicy::relative_expiry (
 {
     TimeBase::TimeT _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -900,7 +877,7 @@ TimeBase::TimeT Messaging::RelativeRoundtripTimeoutPolicy::relative_expiry (
 {
     TimeBase::TimeT _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -999,10 +976,8 @@ Messaging::RoutingTypeRange Messaging::RoutingPolicy::routing_range (
   )
 {
     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);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -1074,7 +1049,7 @@ CORBA::UShort Messaging::MaxHopsPolicy::max_hops (
 {
     CORBA::UShort _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -1146,7 +1121,7 @@ Messaging::Ordering Messaging::QueueOrderPolicy::allowed_orders (
 {
     Messaging::Ordering _tao_retval = 0;
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
@@ -1460,7 +1435,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1486,7 +1461,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1496,7 +1471,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -1508,7 +1483,7 @@ char * Messaging::Poller::operation_name (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1534,7 +1509,7 @@ char * Messaging::Poller::operation_name (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1544,7 +1519,7 @@ char * Messaging::Poller::operation_name (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -1556,7 +1531,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1582,7 +1557,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1592,7 +1567,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -1604,7 +1579,7 @@ void Messaging::Poller::associated_handler (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO));
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1624,7 +1599,7 @@ void Messaging::Poller::associated_handler (
     if (!(
           (_tao_out << associated_handler)
       ))
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
     int _invoke_status =
       _tao_call.invoke (0, 0, ACE_TRY_ENV);
@@ -1636,7 +1611,7 @@ void Messaging::Poller::associated_handler (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES));
 
     }
     break;
@@ -1653,7 +1628,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1679,7 +1654,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1689,7 +1664,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller (
   if (!(
         (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -1701,7 +1676,7 @@ CORBA::Object_ptr Messaging::Poller::target (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1727,7 +1702,7 @@ CORBA::Object_ptr Messaging::Poller::target (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1737,7 +1712,7 @@ CORBA::Object_ptr Messaging::Poller::target (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -1749,7 +1724,7 @@ char * Messaging::Poller::op_name (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1775,7 +1750,7 @@ char * Messaging::Poller::op_name (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1785,7 +1760,7 @@ char * Messaging::Poller::op_name (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -2286,5 +2261,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
 #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
index c44e12642a4..17f921022dd 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -21,10 +21,6 @@
 #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)
@@ -1906,6 +1902,4 @@ operator>> (TAO_InputCDR &, Messaging::Poller_ptr &);
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
 #endif /* TAO_IDL_MESSAGINGC_H */
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
index b77e56ae911..e467c0002da 100644
--- a/TAO/tao/MessagingS.cpp
+++ b/TAO/tao/MessagingS.cpp
@@ -8,10 +8,6 @@
 // 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"
@@ -65,7 +61,7 @@ void* POA_Messaging::RebindPolicy::_downcast (
 
 void POA_Messaging::RebindPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const
@@ -162,7 +158,7 @@ void* POA_Messaging::SyncScopePolicy::_downcast (
 
 void POA_Messaging::SyncScopePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const
@@ -259,7 +255,7 @@ void* POA_Messaging::RequestPriorityPolicy::_downcast (
 
 void POA_Messaging::RequestPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
@@ -356,7 +352,7 @@ void* POA_Messaging::ReplyPriorityPolicy::_downcast (
 
 void POA_Messaging::ReplyPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
@@ -453,7 +449,7 @@ void* POA_Messaging::RequestStartTimePolicy::_downcast (
 
 void POA_Messaging::RequestStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
@@ -550,7 +546,7 @@ void* POA_Messaging::RequestEndTimePolicy::_downcast (
 
 void POA_Messaging::RequestEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
@@ -647,7 +643,7 @@ void* POA_Messaging::ReplyStartTimePolicy::_downcast (
 
 void POA_Messaging::ReplyStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
@@ -744,7 +740,7 @@ void* POA_Messaging::ReplyEndTimePolicy::_downcast (
 
 void POA_Messaging::ReplyEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
@@ -841,7 +837,7 @@ void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast (
 
 void POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
@@ -938,7 +934,7 @@ void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast (
 
 void POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
@@ -1035,7 +1031,7 @@ void* POA_Messaging::RoutingPolicy::_downcast (
 
 void POA_Messaging::RoutingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const
@@ -1132,7 +1128,7 @@ void* POA_Messaging::MaxHopsPolicy::_downcast (
 
 void POA_Messaging::MaxHopsPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const
@@ -1229,7 +1225,7 @@ void* POA_Messaging::QueueOrderPolicy::_downcast (
 
 void POA_Messaging::QueueOrderPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const
@@ -1323,7 +1319,7 @@ void* POA_Messaging::ReplyHandler::_downcast (
 
 void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
@@ -1504,7 +1500,7 @@ void POA_Messaging::Poller::_get_operation_target_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1527,7 +1523,7 @@ void POA_Messaging::Poller::_get_operation_name_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1550,7 +1546,7 @@ void POA_Messaging::Poller::_get_associated_handler_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1567,7 +1563,7 @@ void POA_Messaging::Poller::_set_associated_handler_skel (
   if (!(
     (_tao_in >> associated_handler.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
   _tao_impl->associated_handler (
     associated_handler.in (),
@@ -1596,7 +1592,7 @@ void POA_Messaging::Poller::_get_is_from_poller_skel (
   if (!(
     (_tao_out << CORBA::Any::from_boolean (_tao_retval))
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1619,7 +1615,7 @@ void POA_Messaging::Poller::_get_target_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1642,7 +1638,7 @@ void POA_Messaging::Poller::_get_op_name_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1736,7 +1732,7 @@ void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void *context,
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -1848,5 +1844,3 @@ POA_Messaging::Poller::_this (CORBA_Environment &ACE_TRY_ENV)
   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
index 970a839c7b9..3aadc955ccc 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -11,14 +11,11 @@
 #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 */
@@ -2638,7 +2635,7 @@ private:
 
 };
 
-// #include "MessagingS_T.h"
+#include "MessagingS_T.h"
 
 #if defined (__ACE_INLINE__)
 #include "MessagingS.i"
@@ -2648,6 +2645,4 @@ private:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
 #endif /* TAO_IDL_MESSAGINGS_H */
diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp
index 97db2c29473..3bf7b370101 100644
--- a/TAO/tao/MessagingS_T.cpp
+++ b/TAO/tao/MessagingS_T.cpp
@@ -16,254 +16,10 @@
 #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.i b/TAO/tao/MessagingS_T.i
index fd4a7cf99c9..61f7cfe64b9 100644
--- a/TAO/tao/MessagingS_T.i
+++ b/TAO/tao/MessagingS_T.i
@@ -78,6 +78,22 @@ POA_Messaging::RebindPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 Messaging::RebindMode POA_Messaging::RebindPolicy_tie<T>::rebind_mode  (
     CORBA::Environment &ACE_TRY_ENV
@@ -189,6 +205,22 @@ POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization  (
     CORBA::Environment &ACE_TRY_ENV
@@ -300,6 +332,22 @@ POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 Messaging::PriorityRange POA_Messaging::RequestPriorityPolicy_tie<T>::priority_range  (
     CORBA::Environment &ACE_TRY_ENV
@@ -411,6 +459,22 @@ POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 Messaging::PriorityRange POA_Messaging::ReplyPriorityPolicy_tie<T>::priority_range  (
     CORBA::Environment &ACE_TRY_ENV
@@ -522,6 +586,22 @@ POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::UtcT POA_Messaging::RequestStartTimePolicy_tie<T>::start_time  (
     CORBA::Environment &ACE_TRY_ENV
@@ -633,6 +713,22 @@ POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::UtcT POA_Messaging::RequestEndTimePolicy_tie<T>::end_time  (
     CORBA::Environment &ACE_TRY_ENV
@@ -744,6 +840,22 @@ POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::UtcT POA_Messaging::ReplyStartTimePolicy_tie<T>::start_time  (
     CORBA::Environment &ACE_TRY_ENV
@@ -855,6 +967,22 @@ POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::UtcT POA_Messaging::ReplyEndTimePolicy_tie<T>::end_time  (
     CORBA::Environment &ACE_TRY_ENV
@@ -966,6 +1094,22 @@ POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::TimeT POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::relative_expiry  (
     CORBA::Environment &ACE_TRY_ENV
@@ -1077,6 +1221,22 @@ POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 TimeBase::TimeT POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::relative_expiry  (
     CORBA::Environment &ACE_TRY_ENV
@@ -1188,6 +1348,22 @@ POA_Messaging::RoutingPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 Messaging::RoutingTypeRange POA_Messaging::RoutingPolicy_tie<T>::routing_range  (
     CORBA::Environment &ACE_TRY_ENV
@@ -1299,6 +1475,22 @@ POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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> ACE_INLINE
 CORBA::UShort POA_Messaging::MaxHopsPolicy_tie<T>::max_hops  (
     CORBA::Environment &ACE_TRY_ENV
@@ -1410,6 +1602,22 @@ POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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 ();
+  }
+}
+
 template <class T> ACE_INLINE
 Messaging::Ordering POA_Messaging::QueueOrderPolicy_tie<T>::allowed_orders  (
     CORBA::Environment &ACE_TRY_ENV
@@ -1522,6 +1730,22 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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 ();
+  }
+}
+
 #endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (ACE_HAS_USING_KEYWORD)
@@ -1593,6 +1817,22 @@ POA_Messaging::Poller_tie<T>::_is_owner (CORBA::Boolean b)
   this->rel_ = b;
 }
 
+template <class T> ACE_INLINE 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 ();
+  }
+}
+
 template <class T> ACE_INLINE
 CORBA::Object_ptr POA_Messaging::Poller_tie<T>::operation_target  (
     CORBA::Environment &ACE_TRY_ENV
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 36306a455a2..39356702387 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -153,6 +153,7 @@ CORBA_NVList::add_value (const char *name,
             {
               nv->any_._tao_replace (value.type_,
                                      value.cdr_,
+                                     0,
                                      env);
             }
         }
@@ -225,7 +226,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;
     }
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0be668c7183..3068b4190d2 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -16,6 +16,7 @@
 
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/InconsistentTypeCodeC.h"
 #include "tao/NVList.h"
 #include "tao/Stub.h"
 #include "tao/IIOP_Profile.h"
@@ -29,14 +30,6 @@
 #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"
@@ -71,6 +64,49 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_ORB_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+// 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));
+
+// ORB exception typecode initialization.
+CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode =
+  &_tc_TAO_tc_CORBA_ORB_InconsistentTypeCode;
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 // = Static initialization.
 
 // Count of the number of ORBs.
@@ -79,7 +115,27 @@ int CORBA_ORB::orb_init_count_ = 0;
 // Pointer to the "default ORB."
 CORBA::ORB_ptr CORBA::instance_ = 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_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;
+    }
+}
 
 CORBA_ORB::InvalidName::InvalidName (void)
 {
@@ -108,7 +164,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 (TAO_ORB_Core* orb_core)
   : refcount_ (1),
     open_called_ (0),
     shutdown_lock_ (0),
@@ -118,9 +174,6 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
     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)
 {
@@ -129,9 +182,6 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
     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)
@@ -167,10 +217,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,8 +237,7 @@ CORBA_ORB::open (void)
 
   this->open_called_ = 1;
 
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
+  TAO_Server_Strategy_Factory *f = this->orb_core_->server_factory ();
 
   // @@ For now we simple assume an IIOP handler, in the future
   // @@ this has to be more general
@@ -203,8 +248,8 @@ CORBA_ORB::open (void)
   //    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 *,
+                     this->orb_core_->acceptor ()->acceptor ());
 
   // Initialize the endpoint ... or try!
 
@@ -259,23 +304,21 @@ CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
 
 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);
         }
     }
 }
@@ -292,7 +335,6 @@ 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);
 }
 
@@ -303,89 +345,6 @@ CORBA_ORB::work_pending (void)
   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
@@ -434,7 +393,7 @@ CORBA_ORB::run (ACE_Time_Value *tv,
   while (this->should_shutdown () == 0)
     {
 #if 0
-      counter++;
+   ^   counter++;
       if (counter == max_iterations)
         {
           ACE_TIMEPROBE_PRINT;
@@ -498,22 +457,38 @@ 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,
+  // @@ Irfan: this method should take a CORBA::Environment as
+  // argument!
+  CORBA::Environment env;
+
+  return this->orb_core_->root_poa_reference (env,
                                               adapter_name,
                                               poa_manager,
                                               policies);
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::resolve_poa_current (void)
 {
-  // Return the pointer to the POA Current.
-  return this->orb_core_->poa_current ()._this (ACE_TRY_ENV);
+  // @@ Irfan: this method should take a CORBA::Environment as
+  // argument!
+  // Return the pointer to this thread's POACurrent.
+
+  CORBA::Environment env;
+
+  TAO_POA_Current *poa_current = this->orb_core_->poa_current ();
+  if (poa_current == 0)
+    return CORBA_Object::_nil ();
+
+  PortableServer::Current_var result = poa_current->_this (env);
+  if (env.exception () != 0)
+    return CORBA_Object::_nil ();
+  else
+    return result._retn ();
 }
 
 CORBA_Object_ptr
@@ -547,12 +522,12 @@ CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_service (const char *service_name,
+CORBA_ORB::resolve_service (CORBA::String service_name,
                             ACE_Time_Value *timeout,
                             CORBA::Environment& ACE_TRY_ENV)
 {
   CORBA_Object_ptr return_value = CORBA_Object::_nil ();
-
+  
   // First check to see if we've already initialized this.
   if (this->name_service_ != CORBA_Object::_nil ())
     {
@@ -569,13 +544,13 @@ CORBA_ORB::resolve_service (const char *service_name,
       if (name_service_ior.length () == 0)
         // Third, check to see if the user has an environment variable.
         name_service_ior = ACE_OS::getenv ("NameServiceIOR");
-
+      
       if (name_service_ior.length () != 0)
         {
           this->name_service_ =
             this->string_to_object (name_service_ior.c_str (),
                                     ACE_TRY_ENV);
-
+          
           // check for errors
           if (ACE_TRY_ENV.exception () != 0)
             this->name_service_ = CORBA_Object::_nil ();
@@ -585,13 +560,13 @@ CORBA_ORB::resolve_service (const char *service_name,
           // First, determine if the port was supplied on the command line
           u_short port =
             this->orb_core_->orb_params ()->name_service_port ();
-
+          
           if (port == 0)
             {
               // Look for the port among our environment variables.
               const char *port_number =
                 ACE_OS::getenv ("NameServicePort");
-
+              
               if (port_number != 0)
                 port = ACE_OS::atoi (port_number);
               else
@@ -605,7 +580,7 @@ CORBA_ORB::resolve_service (const char *service_name,
                                         ACE_TRY_ENV);
         }
     }
-
+  
   // Return ior.
   return_value = this->name_service_;
   return CORBA_Object::_duplicate (return_value);
@@ -616,7 +591,7 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
                                     CORBA::Environment& ACE_TRY_ENV)
 {
   CORBA_Object_ptr return_value = CORBA_Object::_nil ();
-
+  
   // First check to see if we've already initialized this.
   if (this->trading_service_ != CORBA_Object::_nil ())
     {
@@ -633,12 +608,12 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
       if (trading_service_ior.length () == 0)
         // Third, check to see if the user has an environment variable.
         trading_service_ior = ACE_OS::getenv ("TradingServiceIOR");
-
+      
       if (trading_service_ior.length () != 0)
         {
           this->trading_service_ =
             this->string_to_object (trading_service_ior.c_str (), ACE_TRY_ENV);
-
+          
           // check for errors
           if (ACE_TRY_ENV.exception () != 0)
             this->trading_service_ = CORBA_Object::_nil ();
@@ -649,18 +624,18 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
           // @@ FRED: need a generic rep for this!
           u_short port =
             this->orb_core_->orb_params ()->trading_service_port ();
-
+          
           if (port == 0)
             {
               // Look for the port among our environment variables.
               const char *port_number = ACE_OS::getenv ("TradingServicePort");
-
+              
               if (port_number != 0)
                 port = ACE_OS::atoi (port_number);
               else
                 port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
             }
-
+          
           this->trading_service_ =
             this->multicast_to_service ("TradingService",
                                         port,
@@ -668,7 +643,7 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
                                         ACE_TRY_ENV);
         }
     }
-
+  
   return_value = this->trading_service_;
   return CORBA_Object::_duplicate (return_value);
 }
@@ -682,133 +657,126 @@ CORBA_ORB::multicast_query (char *buf,
   ACE_INET_Addr my_addr;
   ACE_SOCK_Acceptor acceptor;
   ACE_SOCK_Stream stream;
-  ACE_SOCK_Dgram dgram;
-
-  ssize_t result = 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;
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "acceptor.open () || "
+                       "acceptor.get_local_addr () failed"),
+                      -1);
+
+  // Send a Multicast with service name and a port no.
+  ACE_SOCK_Dgram dgram;
+
+  // 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_RETURN ((LM_ERROR,
+                       "Unable to open the Datagram!\n"),
+                      -1);
+
+  // Convert the port that we are listening at to 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.
+  ssize_t 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
     {
-      // 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)
+      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,
-                      "Unable to open the Datagram!\n"));
+                      "%p\n",
+                      "multicast_query: unable to accept"));
           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."));
+          // 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 sending IIOP multicast"));
+                        "error reading IIOP multicast response"));
           else
             {
+              // Null terminate message.
+              buf[result] = 0;
+
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,
-                            "\n%s; Sent multicast."
-                            "# of bytes sent is %d.\n",
+                            "%s: service resolved to IOR <%s>\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));
-                    }
-                }
+                            buf));
             }
         }
     }
 
-  // We don't need the dgram or acceptor anymore.
+  // We don't need the dgram anymore.  Make sure this is closed way
+  // down here to avoid race conditions...
   dgram.close ();
-  acceptor.close ();
 
   return result == -1 ? -1 : 0;
 }
+
 // @@ 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
@@ -824,32 +792,34 @@ CORBA_ORB::multicast_to_service (const char * service_name,
                                  CORBA::Environment& ACE_TRY_ENV)
 {
   char buf[BUFSIZ + 1];
-
+  
   // Use UDP multicast to locate the  service.
   CORBA_Object_ptr return_value =
     CORBA_Object::_nil ();
-
+  
   if (this->multicast_query (buf,
                              service_name,
                              port,
                              timeout) == 0)
     {
+      //CORBA::Environment env;
+      
       // 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;
     }
-
+  
   // 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,
@@ -858,7 +828,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
 }
 
 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)
 {
@@ -866,10 +836,10 @@ CORBA_ORB::resolve_initial_references (const char *name,
   // -ORBInitRef.
   TAO_IOR_LookupTable *table =
     this->orb_core_->orb_params ()->ior_lookup_table ();
-
+  
   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);
@@ -879,12 +849,12 @@ CORBA_ORB::resolve_initial_references (const char *name,
       // -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;
 
@@ -903,7 +873,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
               list_of_profiles += object_id;
               list_of_profiles += ACE_CString (",");
             }
-
+          
           // Clean up.
           delete [] default_init_ref;
 
@@ -913,7 +883,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
           return this->string_to_object (list_of_profiles.c_str (),
                                          ACE_TRY_ENV);
         }
-
+      
       delete default_init_ref;
     }
 
@@ -924,10 +894,10 @@ CORBA_ORB::resolve_initial_references (const char *name,
     return this->resolve_trading_service (timeout, ACE_TRY_ENV);
 
   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);
+    return this->resolve_poa_current ();
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
     return this->resolve_policy_manager (ACE_TRY_ENV);
@@ -939,27 +909,18 @@ CORBA_ORB::resolve_initial_references (const char *name,
     return this->resolve_service (name, timeout, ACE_TRY_ENV);
 }
 
-// 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);
-}
-
 TAO_Stub *
 CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
                                const char *type_id,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->open () == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), 0);
 
   CORBA::String id = 0;
 
   if (type_id)
-    id = CORBA::string_dup (type_id);
+    id = CORBA::string_copy (type_id);
 
   TAO_Stub *stub = 0;
 
@@ -970,7 +931,11 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
   // @@ Fred, please change this code to use auto_ptr<> and
   //    automatically deallocate the temporary objects. Alternatively
   //    consider about using references ;-)
-  TAO_MProfile mp (1);
+  TAO_MProfile *mp;
+  ACE_NEW_THROW_EX (mp,
+                    TAO_MProfile (1),
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
+  ACE_CHECK_RETURN (stub);
 
   TAO_ORB_Parameters *orb_params =
     this->orb_core_->orb_params ();
@@ -981,14 +946,14 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
                                       orb_params->addr ().get_port_number (),
                                       key,
                                       orb_params->addr ()),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (stub);
 
-  mp.give_profile (pfile);
+  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));
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (stub);
 
   return stub;
@@ -1013,7 +978,7 @@ 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 ();
     }
 
@@ -1090,37 +1055,22 @@ CORBA_ORB::create_dyn_enum      (CORBA_TypeCode_ptr tc,
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-// ****************************************************************
-
 // String utility support; this needs 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
-}
+  size_t len = ACE_OS::strlen (str);
 
-CORBA_String_var::CORBA_String_var (const CORBA_String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
+  // This allocates an extra byte for the '\0';
+  CORBA::String copy = CORBA::string_alloc (len);
 
-CORBA_String_var::~CORBA_String_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = 0;
-    }
+  ACE_OS::memcpy (copy, str, len + 1);
+  return copy;
 }
 
 CORBA_String_var &
@@ -1157,68 +1107,33 @@ CORBA_String_var::operator= (const CORBA_String_var& r)
   return *this;
 }
 
-// ****************************************************************
+// 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 (CORBA::WChar *p)
-  : ptr_ (p)
+CORBA::WString
+CORBA::wstring_alloc (CORBA::ULong len)
 {
-  // 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
+  return new CORBA::WChar [(size_t) (len + 1)];
 }
 
-CORBA_WString_var::CORBA_WString_var (const CORBA_WString_var& r)
+CORBA::WString
+CORBA::wstring_copy (const CORBA::WChar *const str)
 {
-  this->ptr_ = CORBA::wstring_dup (r.ptr_);
-}
+  if (!str)
+    return 0;
 
-CORBA_WString_var::~CORBA_WString_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = 0;
-    }
-}
-
-CORBA_WString_var &
-CORBA_WString_var::operator= (CORBA::WChar *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        CORBA::wstring_free (this->ptr_);
-      this->ptr_ = 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::WChar *p)
-{
-  if (this->ptr_ != 0)
-    CORBA::wstring_free (this->ptr_);
-
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-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 +1144,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 ();
-
       // 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 +1175,72 @@ 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.
+
   // Get ORB Core
-  // @@ As part of the ORB re-architecture this will the point where
+  // @@ As part of the ORB re-architecture this may be 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 ());
+  //    instead of using TAO_ORB_Core_instance ().
+  TAO_ORB_Core *oc = TAO_ORB_Core_instance ();
 
   // Initialize the ORB Core instance.
   int result = oc->init (argc, (char **) argv);
 
+  env.clear ();
+
+  // This (init_orb_globals) must come *after* ORB Core initialization.
+  // Make sure initialization of TAO globals only occurs once.
+  CORBA_ORB::init_orb_globals (env);
+
+  if (env.exception () != 0)
+    return 0;
+
+  // This must come *after* (init_orb_globals).
+  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;
+    }
+
   // 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)
@@ -1488,7 +1408,7 @@ CORBA_ORB::ior_string_to_object (const char *str,
 
   if (tmp [0] && !isspace (tmp [0]))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO),
                         CORBA::Object::_nil ());
     }
 
@@ -1524,7 +1444,10 @@ CORBA_ORB::iiop_string_to_object (const char *string,
   // _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_MProfile *mp;
+  ACE_NEW_RETURN (mp,
+                  TAO_MProfile (1),
+                  obj);
 
   TAO_Profile* pfile;
   ACE_NEW_RETURN (pfile,
@@ -1533,7 +1456,7 @@ CORBA_ORB::iiop_string_to_object (const char *string,
   ACE_CHECK_RETURN (obj);
   // pfile refcount == 1
 
-  mp.give_profile (pfile);
+  mp->give_profile (pfile);
 
   // Now make the TAO_Stub ...
   TAO_Stub *data;
@@ -1565,10 +1488,6 @@ 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
@@ -1618,7 +1537,7 @@ CORBA_ORB::iioploc_string_to_object (const char *string,
   // Now make the TAO_Stub ...
   TAO_Stub *data;
   ACE_NEW_RETURN (data,
-                  TAO_Stub ((char *) 0, mp, this->orb_core_),
+                  TAO_Stub ((char *) 0, &mp, this->orb_core_),
                   CORBA::Object::_nil ());
 
   // Create the CORBA level proxy.
@@ -1639,15 +1558,14 @@ 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)
+  ACE_HANDLE handle = ACE_OS::open (filename, O_RDONLY);
+  if (handle == ACE_INVALID_HANDLE)
     return CORBA::Object::_nil ();
 
-  ACE_Read_Buffer reader (file, 1);
+  ACE_Read_Buffer reader (handle);
 
   char* string = reader.read ();
-
+  ACE_OS::close (handle);
   if (string == 0)
     return CORBA::Object::_nil ();
 
@@ -1816,10 +1734,6 @@ 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)
@@ -1837,22 +1751,17 @@ CORBA_ORB::_tao_find_in_IOR_table (ACE_CString &object_id,
 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 +1808,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 +1823,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>;
@@ -2013,6 +1855,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>
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 4fde0587760..6868e0ec3a5 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -23,7 +23,6 @@
 #include "tao/corbafwd.h"
 #include "tao/Exception.h"
 #include "tao/IOR_LookupTable.h"
-#include "tao/Services.h"
 
 typedef enum
 {
@@ -71,17 +70,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;
 
@@ -206,115 +194,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 +212,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 +223,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()>.
@@ -365,95 +232,27 @@ public:
   // 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 ());
+         const char *str,
+         CORBA_Environment &ACE_TRY_ENV =
+               CORBA::default_environment ());
   // 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 ());
+         CORBA::Object_ptr obj,
+         CORBA_Environment &ACE_TRY_ENV =
+               CORBA::default_environment ());
   // 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;
-
   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,14 +261,23 @@ 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>.
+  // 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.
+
+  // 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;
@@ -522,14 +330,12 @@ public:
 
   // @@EXC@@ Add the ACE_THROW_SPEC for these two functions
 
-  CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               CORBA_Environment &TAO_IN_ENV =
-                                               CORBA::default_environment ());
+  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_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,10 +349,6 @@ 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);
@@ -563,15 +365,14 @@ public:
                                       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 ());
+				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.
 
@@ -632,9 +433,6 @@ public:
   CORBA::Boolean _optimize_collocation_objects (void);
   // Get collocation optimization status.
 
-  TAO_ORB_Core *orb_core (void) const;
-  // Get the ORB core.
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_ORB_ptr _ptr_type;
   typedef CORBA_ORB_var _var_type;
@@ -643,10 +441,10 @@ public:
 
 protected:
   // We must be created via the <ORB_init> call.
-  CORBA_ORB (TAO_ORB_Core *orb_core);
+  CORBA_ORB (TAO_ORB_Core* orb_core);
   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&);
@@ -659,35 +457,35 @@ protected:
   // Implements the run routine
 
 private:
-
-  CORBA_Object_ptr resolve_service (const char* service_name,
-                                    ACE_Time_Value *timeout,
+  
+  CORBA_Object_ptr resolve_service (CORBA::String service_name,
+				    ACE_Time_Value *timeout,
                                     CORBA::Environment& ACE_TRY_ENV);
   // Resolve the service name.
-
+  
   CORBA_Object_ptr resolve_trading_service (ACE_Time_Value *timeout,
                                             CORBA::Environment& ACE_TRY_ENV);
   // Resolve the trading object reference.
-
+  
   int multicast_query (char *buf,
-                       const char *service_name,
-                       u_short port,
-                       ACE_Time_Value *timeout);
+		       const char *service_name,
+		       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,
                                          u_short port,
                                          ACE_Time_Value *timeout,
                                          CORBA::Environment& ACE_TRY_ENV);
   // 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
@@ -750,14 +548,9 @@ private:
   TAO_Leader_Follower_Info  leader_follower_info_;
   // Information about the leader follower model
 
-  TAO_ORB_Core *orb_core_;
+  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.
 
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index f99fd2ee274..ba7d47392c5 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -1,10 +1,32 @@
 // -*- 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
 // ----------------------------------------------------------------------
 
+ACE_INLINE TAO_Export CORBA::String
+CORBA::string_dup (const CORBA::Char *str)
+{
+  return CORBA::string_copy (str);
+}
+
 ACE_INLINE
 CORBA_String_var::CORBA_String_var (void)
 {
@@ -13,7 +35,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 +142,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 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 *()
+ACE_INLINE TAO_Export CORBA::WString
+CORBA::wstring_dup (const WChar *const str)
 {
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_WString_var::operator const CORBA::WChar *() const
-{
-  return this->ptr_;
+  return CORBA::wstring_copy (str);
 }
 
-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
 // ---------------------------------------------------------------------------
@@ -341,12 +250,6 @@ CORBA_ORB::_optimize_collocation_objects (void)
   return this->optimize_collocation_objects_;
 }
 
-ACE_INLINE TAO_ORB_Core *
-CORBA_ORB::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
 // *************************************************************
 // Inline operations for class CORBA_ORB_var
 // *************************************************************
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index a463d1adc8a..ce4812c5f8e 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,15 +1,16 @@
 // $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/default_client.h"
 #include "tao/default_server.h"
-#include "tao/default_resource.h"
 #include "tao/debug.h"
 #include "tao/IOR_LookupTable.h"
 
@@ -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,10 +58,12 @@ TAO_ORB_Core::TAO_ORB_Core (void)
     arl_same_port_connect_ (0),
 #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
     preconnections_ (0),
-    poa_current_ (0)
+    default_environment_ (0),
+    tss_environment_ (this)
+#if defined (TAO_HAS_CORBA_MESSAGING)
+    , policy_current_ (&this->initial_policy_current_)
+#endif /* TAO_HAS_CORBA_MESSAGING */
 {
-  ACE_NEW (this->poa_current_,
-           TAO_POA_Current);
 }
 
 TAO_ORB_Core::~TAO_ORB_Core (void)
@@ -60,11 +72,18 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   // here once that chunk is actually implemented.
   if (preconnections_)
     ACE_OS::free (preconnections_);
+}
 
-  // Allocated in init()
-  delete this->orb_params_;
+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)
+{
+}
 
-  delete this->poa_current_;
+TAO_Default_Reactor::~TAO_Default_Reactor (void)
+{
 }
 
 int
@@ -111,10 +130,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++] = CORBA::string_dup (argv[0]);
 
   ACE_Env_Value<int> defport ("TAO_DEFAULT_SERVER_PORT",
                               TAO_DEFAULT_SERVER_PORT);
@@ -450,6 +466,25 @@ TAO_ORB_Core::init (int &argc, char *argv[])
         arg_shifter.ignore_arg ();
     }
 
+#if defined (DEBUG)
+  // Make it a little easier to debug programs using this code.
+  {
+    // 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;
   if (this->set_endpoint (dotted_decimal_addresses,
@@ -520,28 +555,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);
+  CORBA::ORB_ptr this_orb;
+  ACE_NEW_RETURN (this_orb, CORBA_ORB (this), 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.
@@ -572,6 +609,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
 
   this->orb_params ()->use_lite_protocol (giop_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)
     return -1;
@@ -650,7 +689,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 +702,6 @@ TAO_ORB_Core::fini (void)
   if (!this->server_factory_from_service_config_)
     delete server_factory_;
 
-  delete this;
-
   return 0;
 }
 
@@ -689,16 +726,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 +816,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,6 +827,7 @@ 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 ();
@@ -824,17 +862,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;
 }
@@ -870,7 +937,6 @@ TAO_ORB_Core::create_and_set_root_poa (const char *adapter_name,
                      *policies,
                      0,
                      this->object_adapter ()->lock (),
-                     this->object_adapter ()->thread_lock (),
                      *this,
                      env);
 
@@ -1074,99 +1140,475 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void)
   return this->resource_factory ()->output_cdr_buffer_allocator ();
 }
 
-ACE_Reactor *
-TAO_ORB_Core::reactor (ACE_Reactor *r)
+// ****************************************************************
+
+
+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)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
+}
 
-  ACE_Reactor *old_reactor = tss->reactor_;
-  tss->reactor_ = r;
-  return old_reactor;
+TAO_Resource_Factory::~TAO_Resource_Factory (void)
+{
 }
 
-ACE_Reactor *
-TAO_ORB_Core::reactor (void)
+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;
 
-  if (tss->reactor_ == 0)
-    tss->reactor_ = this->resource_factory ()->get_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;
 
-  return tss->reactor_;
+  return 0;
 }
 
-TAO_POA_Current &
-TAO_ORB_Core::poa_current (void) const
-{
-  return *this->poa_current_;
+#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;\
+}
+
+#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;\
 }
 
-CORBA_Environment*
-TAO_ORB_Core::default_environment (void) const
+IMPLEMENT_PRE_GET_METHOD(object_adapter, TAO_Object_Adapter *, object_adapter_)
+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 TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_;
+  switch (poa_source_)
+    {
+    case TAO_GLOBAL:
+      return GLOBAL_APP_ALLOCATED::instance ()->poa_;
+    case TAO_TSS:\
+      return TSS_APP_ALLOCATED::instance ()->poa_;
+    }
+  return 0;
 }
 
 void
-TAO_ORB_Core::default_environment (CORBA_Environment* env)
+TAO_Resource_Factory::set_root_poa (TAO_POA *pp)
 {
-  TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_ = env;
+  switch (poa_source_)
+    {
+    case TAO_GLOBAL:
+      GLOBAL_APP_ALLOCATED::instance ()->poa_ = pp;
+      break;
+    case TAO_TSS:
+      TSS_APP_ALLOCATED::instance ()->poa_ = pp;
+      break;
+    }
 }
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-TAO_Policy_Current*
-TAO_ORB_Core::policy_current (void) const
+void
+TAO_Resource_Factory::set_orb (CORBA::ORB_ptr op)
 {
-  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->policy_current_;
+  switch (resource_source_)
+    {
+    case TAO_GLOBAL:
+      GLOBAL_APP_ALLOCATED::instance ()->orb_ = op;
+      break;
+    case TAO_TSS:
+      TSS_APP_ALLOCATED::instance ()->orb_ = op;
+      break;
+    }
 }
 
-TAO_Policy_Current*
-TAO_ORB_Core::policy_current (TAO_Policy_Current* current)
+void
+TAO_Resource_Factory::set_allocator (ACE_Allocator *alloc)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
+  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 *old = tss->policy_current_;
-  tss->policy_current_ = current;
-  return old;
+ACE_Allocator *
+TAO_Resource_Factory::get_allocator (void)
+{
+  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_Allocator*
+TAO_Resource_Factory::output_cdr_dblock_allocator (void)
+{
+  switch (this->cdr_allocator_source_)
+    {
+    case TAO_GLOBAL:
+      if (GLOBAL_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_,
+                          GBL_ALLOCATOR,
+                          0);
+        }
+      return GLOBAL_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_;
+      ACE_NOTREACHED (break);
+    case TAO_TSS:
+      if (TSS_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_,
+                          TSS_ALLOCATOR,
+                          0);
+        }
+      return TSS_APP_ALLOCATED::instance ()->output_cdr_dblock_allocator_;
+      ACE_NOTREACHED (break);
+    }
+  return 0;
+}
+
+ACE_Allocator *
+TAO_Resource_Factory::output_cdr_buffer_allocator (void)
+{
+  switch (this->cdr_allocator_source_)
     {
-      delete this->output_cdr_buffer_allocator_;
-      this->output_cdr_buffer_allocator_ = 0;
+    case TAO_GLOBAL:
+      if (GLOBAL_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_,
+                          GBL_ALLOCATOR,
+                          0);
+        }
+      return GLOBAL_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_;
+    case TAO_TSS:
+      if (TSS_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_,
+                          TSS_ALLOCATOR,
+                          0);
+        }
+      return TSS_APP_ALLOCATED::instance ()->output_cdr_buffer_allocator_;
+    }
+  return 0;
+}
+
+
+ACE_Data_Block*
+TAO_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_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 ()),
+    object_adapter_ (TAO_ORB_CORE::instance ()->server_factory ()->active_object_map_creation_parameters (),
+                     *TAO_ORB_CORE::instance ()),
+    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),
+    output_cdr_dblock_allocator_ (0),
+    output_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_;
+
+  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_;
+}
+
+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,19 +1623,89 @@ 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_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_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 *>;
@@ -1204,27 +1716,54 @@ template class ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Co
 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_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_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_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_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 *>
@@ -1235,17 +1774,26 @@ template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>;
 #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_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_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 */
+
+ACE_STATIC_SVC_DEFINE (TAO_Resource_Factory,
+                       ASYS_TEXT ("Resource_Factory"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Resource_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 486ee1cf4eb..15aa540c1bf 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -17,18 +17,22 @@
 #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/IIOP_Connector.h"
+#include "tao/IIOP_Acceptor.h"
+#include "tao/POA.h"
+
 #include "tao/Policy_Manager.h"
-#include "tao/Resource_Factory.h"
+
 #include "tao/params.h"
-#include "tao/POAC.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 +42,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_Object_Adapter *, 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 +107,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 +127,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);
@@ -112,7 +175,7 @@ public:
   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.
@@ -243,8 +306,8 @@ public:
   // 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
+  void 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.
 
@@ -283,19 +346,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 +368,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 +382,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 +427,318 @@ protected:
   // A string of comma-separated <{host}>:<{port}> pairs used to
   // pre-establish connections using <preconnect>.
 
+  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.
+
 #if defined (TAO_HAS_CORBA_MESSAGING)
   TAO_Policy_Manager policy_manager_;
   // The Policy_Manager for this ORB.
 
+  TAO_Policy_Current initial_policy_current_;
+  // The initial PolicyCurrent for this thread. Should be a TSS
+  // resource.
+
+  TAO_Policy_Current* policy_current_;
+  // This pointer is reset by the POA on each upcall.
+
   TAO_Policy_Manager_Impl default_policies_;
   // The default policies.
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-  TAO_POA_Current *poa_current_;
-  // POA current.
-  //
-  // Note that this is a pointer in order to reduce the include file
-  // dependencies.
-  //
 };
 
-// ****************************************************************
+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 TAO_Object_Adapter *object_adapter (void);
+  // Return a object adapter 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.
 
-typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
-        TAO_ORB_CORE_TSS_RESOURCES;
+  virtual int reactor_lock (void);
+  // Returns 0 if a reactor without locking was configured.
+
+  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.
+
+  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.
+
+    TAO_Object_Adapter object_adapter_;
+    // Object Adapter.
+
+    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.
+
+    ACE_Allocator *output_cdr_dblock_allocator_;
+    ACE_Allocator *output_cdr_buffer_allocator_;
+    // The allocators for the output 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 +746,7 @@ extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
 # include "tao/ORB_Core.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_STATIC_SVC_DECLARE (TAO_Resource_Factory)
+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..30cb817a2cb 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -6,6 +6,20 @@
 #define TAO_OC_RETRIEVE(member) \
   ((this->member##_ == 0) ? (this->member##_ = this->resource_factory ()->get_##member ()) : (this->member##_) )
 
+ACE_INLINE ACE_Reactor *
+TAO_ORB_Core::reactor (ACE_Reactor *r)
+{
+  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 TAO_Object_Adapter *
 TAO_ORB_Core::object_adapter (void)
 {
@@ -29,7 +43,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 +59,17 @@ TAO_ORB_Core::root_poa (const char *adapter_name,
   return this->root_poa_;
 }
 
+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 +103,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,6 +131,18 @@ TAO_ORB_Core::using_collocation (CORBA::Boolean use_col)
   return retv;
 }
 
+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)
 {
@@ -110,6 +156,18 @@ TAO_ORB_Core::policy_manager (void)
   return &this->policy_manager_;
 }
 
+ACE_INLINE TAO_Policy_Current*
+TAO_ORB_Core::policy_current (void) const
+{
+  return this->policy_current_;
+}
+
+ACE_INLINE void
+TAO_ORB_Core::policy_current (TAO_Policy_Current* current)
+{
+  this->policy_current_ = current;
+}
+
 ACE_INLINE CORBA::Policy_ptr
 TAO_ORB_Core::get_default_policy (
       CORBA::PolicyType policy,
@@ -121,3 +179,41 @@ TAO_ORB_Core::get_default_policy (
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 // ****************************************************************
+
+ACE_INLINE void
+TAO_Resource_Factory::resource_source (int which_source)
+{
+  resource_source_ = which_source;
+}
+
+ACE_INLINE int
+TAO_Resource_Factory::resource_source (void)
+{
+  return resource_source_;
+}
+
+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..34898f25bfa 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -82,7 +82,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -103,7 +103,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
       if (!(
           (_tao_out << type_id)
       ))
-        ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+        ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 
       int _invoke_status =
         _tao_call.invoke (0, 0, ACE_TRY_ENV);
@@ -115,7 +115,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
         // cannot happen
       if (_invoke_status != TAO_INVOKE_OK)
       {
-        ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+        ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
       }
       break;
@@ -124,7 +124,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
   if (!(
     (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
   ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -153,15 +153,11 @@ CORBA_Object::_is_collocated (void) const
 CORBA::Boolean
 CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_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;
+    CORBA::Boolean _tao_retval = 0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -187,7 +183,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -198,7 +194,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
   if (!(
         (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
   return _tao_retval;
 }
 
@@ -268,39 +264,9 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
   // 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 ());
+      TAO_THROW(CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO));
     }
-  request = new CORBA::Request (this,
-                                operation,
-                                arg_list,
-                                result,
-                                req_flags,
-                                TAO_IN_ENV);
+  request = new CORBA::Request (this, operation, arg_list, result, req_flags);
 }
 
 CORBA::Request_ptr
@@ -308,9 +274,7 @@ 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
@@ -325,7 +289,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -349,7 +313,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -363,10 +327,10 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 #else
     ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 #endif
 }
 
@@ -493,7 +457,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
     }
 
   // get a profile container to store all profiles in the IOR.
-  TAO_MProfile mp (profile_count);
+  auto_ptr<TAO_MProfile> mp (new TAO_MProfile (profile_count));
 
   while (profile_count-- != 0 && cdr.good_bit ())
     {
@@ -574,7 +538,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
             break;
           case 1:
           default:
-            mp.give_profile (pfile);
+            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!
@@ -584,7 +548,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
     } // while loop
 
   // make sure we got some profiles!
-  if (mp.profile_count () == 0)
+  if (mp->profile_count () == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "no IIOP v%d.%d (or earlier) profile in IOR!\n",
@@ -597,7 +561,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
   // TAO_Stub will make a copy of mp!
   TAO_Stub *objdata;
   ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (),
-                                     mp,
+                                     mp.get (),
                                      cdr.orb_core ()), 0);
 
   if (objdata == 0)
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index e35974ef463..977838fd88b 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -43,8 +43,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
@@ -54,8 +53,7 @@ public:
   // appropriate.
 
   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,55 +66,37 @@ 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 ());
+  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.
-
-  // 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,
-                                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 CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Interface repository related operation
 
   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 */
@@ -151,8 +131,7 @@ public:
 #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,15 +139,13 @@ 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 ());
+  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.
 
@@ -292,8 +269,7 @@ 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;
 };
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
index d8daa7dbd11..6f4aa52395e 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -100,14 +100,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
     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)
+    lock_ (orb_core.server_factory ()->create_poa_lock ())
 {
   TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
 
@@ -181,37 +174,9 @@ 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,
@@ -235,21 +200,6 @@ TAO_Object_Adapter::dispatch_servant_i (const TAO_ObjectKey &key,
                                         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;
 
@@ -261,11 +211,11 @@ TAO_Object_Adapter::dispatch_servant_i (const TAO_ObjectKey &key,
 
   // Setup for POA Current
   const char *operation = req.operation ();
-  TAO_POA_Current_Impl current_context (poa,
-                                        key,
-                                        0,
-                                        operation,
-                                        this->orb_core_);
+  TAO_POA_Current current_context (poa,
+                                   key,
+                                   0,
+                                   operation,
+                                   this->orb_core_);
 
   PortableServer::Servant servant = 0;
 
@@ -283,32 +233,6 @@ TAO_Object_Adapter::dispatch_servant_i (const TAO_ObjectKey &key,
   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
@@ -347,7 +271,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
 
   if (result != 0)
     {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
+      ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO));
     }
 
   {
@@ -363,7 +287,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
 
   if (result != 0)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO));
     }
 }
 
@@ -376,16 +300,6 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 
 #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 ();
@@ -393,7 +307,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
   TAO_POA *parent = this->orb_core_.root_poa ();
   if (parent->name () != *iterator)
     {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO),
                         -1);
     }
   else
@@ -512,6 +426,9 @@ PortableServer::Servant
 TAO_Object_Adapter::find_servant_i (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);
+
   PortableServer::ObjectId id;
   TAO_POA *poa = 0;
 
@@ -784,97 +701,17 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const
 
 ////////////////////////////////////////////////////////////////////////////////
 
-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)
 
-////////////////////////////////////////////////////////////////////////////////
+template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
+template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
+template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
 
 // 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;
@@ -882,15 +719,6 @@ 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
@@ -945,10 +773,15 @@ template class ACE_Map_Entry<key, value>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#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>
+
 // 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;
@@ -956,15 +789,6 @@ 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
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h
index f41875430d4..3024bc64b44 100644
--- a/TAO/tao/Object_Adapter.h
+++ b/TAO/tao/Object_Adapter.h
@@ -19,7 +19,6 @@
 
 #include "tao/Key_Adapters.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -83,10 +82,6 @@ public:
 
   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:
@@ -128,11 +123,6 @@ protected:
   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
@@ -225,8 +215,6 @@ public:
 
   };
 
-protected:
-
   Hint_Strategy *hint_strategy_;
 
   typedef ACE_Map<
@@ -286,23 +274,8 @@ protected:
 
   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
@@ -352,90 +325,6 @@ public:
     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;
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i
index a769a92aaad..5dfd0408b36 100644
--- a/TAO/tao/Object_Adapter.i
+++ b/TAO/tao/Object_Adapter.i
@@ -1,23 +1,13 @@
 // $Id$
 
+#include "tao/ORB_Core.h"
+
 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 ()
@@ -121,3 +111,4 @@ TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_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..2730a72180f 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -49,3 +49,26 @@ 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;
+}
+
+int
+operator!= (const TAO_ObjectKey &lhs,
+            const TAO_ObjectKey &rhs)
+{
+  return !(lhs == rhs);
+}
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 3c66349b5ea..40812a64469 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -89,6 +89,12 @@ private:
   void operator= (const TAO_ObjectKey_var &);
 };
 
+extern TAO_Export int operator== (const TAO_ObjectKey &l,
+                                  const TAO_ObjectKey &r);
+
+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..ef7ebeecc97 100644
--- a/TAO/tao/Operation_Table.cpp
+++ b/TAO/tao/Operation_Table.cpp
@@ -12,16 +12,16 @@ 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"
   };
@@ -31,16 +31,16 @@ 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
   };
@@ -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"));
 }
@@ -242,7 +242,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
                                 const unsigned int length)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
-
+  
   const TAO_operation_db_entry *entry = lookup (opname,
                                                 length);
   if (entry == 0)
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 12fe314d8b6..7d3fe49c304 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -5,7 +5,6 @@
 
 #include "tao/POA.h"
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Environment.h"
 #include "tao/Exception.h"
@@ -20,6 +19,7 @@
 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
@@ -29,14 +29,727 @@ TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
   017, // octal for ^o
   000
 };
-#endif /* TAO_NO_IOR_TABLE */
+
+#endif
+
+#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 ());
+
+  // 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)
+{
+  // 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 (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;
+}
+
+CORBA::PolicyType
+TAO_Thread_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  return PortableServer::THREAD_POLICY_ID;
+}
+
+PortableServer::POA_ptr
+TAO_Thread_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+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 &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
+{
+  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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_lifespan_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Lifespan_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_id_uniqueness_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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)
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  return this->value_;
+}
+
+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 ());
+
+  // 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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_id_assignment_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Id_Assignment_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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;
+}
+
+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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_implicit_activation_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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)
+{
+  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 &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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_servant_retention_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Servant_Retention_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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))
+{
+}
+
+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 &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_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 ());
+
+  // Make sure that the auto_ptr does not delete the implementation
+  // object.
+  new_request_processing_policy.release ();
+  return result._retn ();
+}
+
+void
+TAO_Request_Processing_Policy::destroy (CORBA::Environment &ACE_TRY_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 (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;
+}
+
+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 ());
+}
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+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)
+{
+}
+
+void
+TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
+                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  for (CORBA::ULong i = 0;
+       i < policies.length ();
+       i++)
+    {
+      this->parse_policy (policies[i],
+                          ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  if (this->validity_check () == -1)
+    {
+      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+    }
+}
+
+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 &ACE_TRY_ENV)
+{
+
+#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 ()))
+    {
+      this->request_processing_ = request_processing->value (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      return;
+    }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+  ACE_THROW (PortableServer::POA::InvalidPolicy ());
+}
 
 TAO_POA::TAO_POA (const TAO_POA::String &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),
@@ -50,21 +763,17 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     adapter_activator_ (),
     servant_activator_ (),
     servant_locator_ (),
-    default_servant_ (),
+    default_servant_ (0),
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
     children_ (),
     lock_ (lock),
+    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)
+    orb_core_ (orb_core)
 {
   // Set the folded name of this POA.
   this->set_folded_name ();
@@ -161,8 +870,7 @@ TAO_POA::create_POA (const char *adapter_name,
       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;
+      new_poa_manager_impl = auto_ptr<TAO_POA_Manager> (poa_manager_impl);
     }
   else
     {
@@ -234,7 +942,6 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                              policies,
                              this,
                              this->orb_core_.object_adapter ()->lock (),
-                             this->orb_core_.object_adapter ()->thread_lock (),
                              this->orb_core_,
                              ACE_TRY_ENV),
                     CORBA::NO_MEMORY ());
@@ -362,7 +1069,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
                     CORBA::Boolean wait_for_completion,
                     CORBA::Environment &ACE_TRY_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
@@ -398,25 +1105,80 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
   // 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 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.
+
+  // Remove the registered objects
+  if (etherealize_objects)
+    {
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+      if (this->policies ().servant_retention () == PortableServer::RETAIN &&
+          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;
+
+          while (1)
+            {
+              PortableServer::ObjectId object_id;
+              PortableServer::Servant servant = 0;
+              CORBA::Boolean remaining_activations = 0;
+
+              // Remove an entry from the active object map, returning
+              // the object id, the servant pointer, and remaining
+              // activations of the servant.
+              //
+              // int result = this->active_object_map ().unbind (object_id,
+              //                                                servant,
+              //                                                remaining_activations);
+
+              int result = 1;
+
+              // Nothing to unbind.
+              if (result == 1)
+                {
+                  break;
+                }
+              // Errors.
+              else if (result != 0)
+                {
+                  ACE_THROW (CORBA::OBJ_ADAPTER ());
+                }
+              // Successful unbind.
+              else
+                {
+                  // Etherealize servant.
+                  this->servant_activator_->etherealize (object_id,
+                                                         self.in (),
+                                                         servant,
+                                                         1,
+                                                         remaining_activations,
+                                                         ACE_TRY_ENV);
+                  ACE_CHECK;
+                }
+            }
+        }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+    }
+
   // 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);
-
-  while (wait_for_completion &&
-         this->outstanding_requests_ > 0)
-    {
-      this->destroy_pending_ = 1;
-      int result = this->outstanding_requests_condition_.wait ();
-      if (result == -1)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
+  ACE_UNUSED_ARG (wait_for_completion);
 
   // Commit suicide
   delete this;
@@ -429,7 +1191,7 @@ TAO_POA::delete_child (const TAO_POA::String &child)
 
   // 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);
     }
@@ -513,20 +1275,9 @@ TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
 
   // 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
@@ -552,20 +1303,6 @@ TAO_POA::set_servant_i (PortableServer::Servant servant,
   // 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 */
@@ -604,21 +1341,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
                         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 ();
 }
 
@@ -674,70 +1397,7 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
       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)
-    {
-      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;
-    }
 }
 
 void
@@ -751,9 +1411,10 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
       ACE_THROW (PortableServer::POA::WrongPolicy ());
     }
 
-  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.
+  int result = this->active_object_map ().unbind_using_user_id (id);
 
   // If there is no active object associated with the specified Object
   // Id, the operation raises an ObjectNotActive exception.
@@ -762,36 +1423,8 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
       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;
-    }
-}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
 
-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,65 +1437,30 @@ 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 (ACE_TRY_ENV);
+      ACE_CHECK;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+      // Place holders....
+      PortableServer::Servant servant = 0;
+      CORBA::Boolean remaining_activations = 0;
+      int disabled = 1;
 
-      if (this->etherealize_objects_ &&
-          this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER &&
-          !CORBA::is_nil (this->servant_activator_.in ()))
+      if (disabled)
         {
-          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_,
+          this->servant_activator_->etherealize (id,
                                                  self.in (),
-                                                 active_object_map_entry->servant_,
-                                                 this->cleanup_in_progress_,
+                                                 servant,
+                                                 0,
                                                  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;
-        }
-
-      // 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_);
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
 }
 
 CORBA::Object_ptr
@@ -992,21 +1590,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
                             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 ();
     }
 
@@ -1060,21 +1644,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
                             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 ();
     }
 
@@ -1145,7 +1715,6 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
                                     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 () ||
@@ -1160,38 +1729,16 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
       // 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::ObjectId user_id;
       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,
+      if (this->active_object_map ().find_servant_and_user_id_using_system_id (system_id,
                                                                                servant,
-                                                                               entry) != -1)
+                                                                               user_id) != -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
@@ -1212,21 +1759,9 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_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.
@@ -1273,7 +1808,6 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
                                 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 () ||
@@ -1320,16 +1854,6 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
   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);
-
       return servant;
     }
   else
@@ -1423,28 +1947,13 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
   // 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;
-        }
-    }
+  PortableServer::ObjectId user_id;
+  if (this->policies ().servant_retention () == PortableServer::RETAIN &&
+      this->active_object_map ().find_servant_and_user_id_using_system_id (system_id,
+                                                                           servant,
+                                                                           user_id) != -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
@@ -1453,9 +1962,7 @@ 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;
-    }
+    return TAO_POA::NOT_FOUND;
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
@@ -1465,15 +1972,11 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
   // the POA, return TAO_POA::NOT_FOUND.
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
-      if (this->default_servant_.in () == 0)
-        {
-          return TAO_POA::NOT_FOUND;
-        }
+      if (this->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
@@ -1484,14 +1987,10 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
     {
       if (CORBA::is_nil (this->servant_activator_.in ()) &&
           CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          return TAO_POA::NOT_FOUND;
-        }
+        return TAO_POA::NOT_FOUND;
       else
-        {
-          // Success
-          return TAO_POA::SERVANT_MANAGER;
-        }
+        // Success
+        return TAO_POA::SERVANT_MANAGER;
     }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -1503,16 +2002,9 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
 PortableServer::Servant
 TAO_POA::locate_servant_i (const char *operation,
                            const PortableServer::ObjectId &system_id,
-                           TAO_POA_Current_Impl *poa_current_impl,
+                           TAO_POA_Current *poa_current,
                            CORBA::Environment &ACE_TRY_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);
-    }
-
   // 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
@@ -1520,19 +2012,12 @@ TAO_POA::locate_servant_i (const char *operation,
   if (this->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_;
 
-          // Success
-          return servant;
-        }
+      if (this->active_object_map ().find_servant_and_user_id_using_system_id (system_id,
+                                                                               servant,
+                                                                               poa_current->object_id_) != -1)
+        // Success
+        return servant;
     }
 
   // If the POA has the NON_RETAIN policy or has the RETAIN policy but
@@ -1556,8 +2041,7 @@ TAO_POA::locate_servant_i (const char *operation,
   // exception.
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result == 0)
+      if (this->default_servant_ == 0)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                             0);
@@ -1565,7 +2049,7 @@ TAO_POA::locate_servant_i (const char *operation,
       else
         {
           // Success
-          return result;
+          return this->default_servant_;
         }
     }
 
@@ -1599,34 +2083,27 @@ TAO_POA::locate_servant_i (const char *operation,
       PortableServer::POA_var poa = this->_this (ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      PortableServer::Servant servant = 0;
+      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);
+        }
+
       if (this->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);
+          // @@
+          // 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 = this->servant_activator_->incarnate (user_id.in (),
+                                                                                 poa.in (),
+                                                                                 ACE_TRY_ENV);
+          ACE_CHECK_RETURN (0);
 
-            if (servant == 0)
-              return 0;
-          }
+          if (servant == 0)
+            return 0;
 
           // If the incarnate operation returns a servant that is
           // already active for a different Object Id and if the POA
@@ -1645,40 +2122,22 @@ TAO_POA::locate_servant_i (const char *operation,
           // 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 (this->active_object_map ().rebind_using_user_id_and_system_id (servant,
+                                                                             user_id.in (),
+                                                                             system_id) == -1)
             {
               ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                                 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,7 +2147,7 @@ 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 (),
+          PortableServer::Servant servant = this->servant_locator_->preinvoke (user_id.in (),
                                                                                poa.in (),
                                                                                operation,
                                                                                cookie,
@@ -1699,7 +2158,7 @@ TAO_POA::locate_servant_i (const char *operation,
             return 0;
 
           // Remember the cookie
-          poa_current_impl->locator_cookie (cookie);
+          poa_current->locator_cookie (cookie);
 
           // Success
           return servant;
@@ -1914,8 +2373,8 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 #if !defined (TAO_NO_IOR_TABLE)
   // Add the object key prefix.
   ACE_OS::memcpy (&buffer[starting_at],
-                  &objectkey_prefix[0],
-                  TAO_OBJECTKEY_PREFIX_SIZE);
+		  &objectkey_prefix[0],
+		  TAO_OBJECTKEY_PREFIX_SIZE);
 
   starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
 #endif /* TAO_NO_IOR_TABLE */
@@ -2136,7 +2595,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,85 +2607,6 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
   return string;
 }
 
-void
-TAO_POA::encode_sequence_to_string (CORBA::String &str,
-                                    const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length() + 1 /* for zero termination */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (cp+len) && i < seq.length();
-       i++)
-    {
-      u_char byte = seq[i];
-      if (isprint (byte) && byte != '\\')
-        {
-          *cp++ = (char) byte;
-          continue;
-        }
-
-      *cp++ = '\\';
-      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
-      *cp++ = ACE::nibble2hex (byte & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-void
-TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                    const char *str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       i++)
-    {
-      if (*cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        // Copy it in
-        seq[i] = *cp++;
-    }
-
-  // Set the length appropriately
-  seq.length (i);
-}
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 PortableServer::ThreadPolicy_ptr
@@ -2249,10 +2629,6 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
   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 ();
@@ -2281,10 +2657,6 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
   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 ();
@@ -2311,10 +2683,6 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va
   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 ();
@@ -2341,10 +2709,6 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
   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 ();
@@ -2373,10 +2737,6 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo
   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 ();
@@ -2403,10 +2763,6 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy
   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 ();
@@ -2433,10 +2789,6 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli
   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 ();
@@ -2445,731 +2797,83 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 
 #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)
-{
-  //
-  // 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_Thread_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::THREAD_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Thread_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-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 &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  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 ();
-}
-
-void
-TAO_Lifespan_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_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 ();
-}
-
-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)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-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 ());
-
-  // 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 ());
-
-  // Give ownership of this servant to the POA.
-  new_id_assignment_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_assignment_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Id_Assignment_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_Assignment_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::ID_ASSIGNMENT_POLICY_ID;
-}
-
-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 ());
-
-  // Give ownership of this servant to the POA.
-  new_implicit_activation_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_implicit_activation_policy.release ();
-  return result._retn ();
-}
-
-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)
-{
-  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 &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 ();
-}
-
-void
-TAO_Servant_Retention_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_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))
-{
-}
-
-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 &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_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 ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_request_processing_policy.release ();
-  return result._retn ();
-}
-
 void
-TAO_Request_Processing_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::encode_sequence_to_string (CORBA::String &str,
+                                    const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
 {
+  // We must allocate a buffer which is (gag) 3 times the length
+  // of the sequence, which is the length required in the worst-case
+  // scenario of all non-printable characters.
   //
-  // 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 ());
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  // There are two strategies here...we could allocate all that space here,
+  // fill it up, then copy-allocate new space of just the right length.
+  // OR, we could just return this space.  The classic time-space tradeoff,
+  // and for now we'll let time win out, which means that we only do the
+  // allocation once.
+  u_int len = 3 * seq.length() + 1 /* for zero termination */;
+  str = CORBA::string_alloc (len);
 
-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)
-{
-}
+  char *cp = str;
 
-void
-TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
+  for (u_int i = 0;
+       cp < (cp+len) && i < seq.length();
        i++)
     {
-      this->parse_policy (policies[i],
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+      u_char byte = seq[i];
+      if (isprint (byte) && byte != '\\')
+        {
+          *cp++ = (char) byte;
+          continue;
+        }
 
-  if (this->validity_check () == -1)
-    {
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+      *cp++ = '\\';
+      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
+      *cp++ = ACE::nibble2hex (byte & 0x0f);
     }
-}
-
-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;
+  // Zero terminate
+  *cp = '\0';
 }
 
 void
-TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                    const char *str)
 {
-
-#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 ()))
+  if (str == 0)
     {
-      this->implicit_activation_ = implicit_activation->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      seq.length (0);
       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;
-    }
+  u_int length = ACE_OS::strlen (str);
+  const char *eos = str + length;
+  const char *cp = str;
 
-  PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
+  // Set the length of the sequence to be as long as
+  // we'll possibly need...we'll reset it to the actual
+  // length later.
+  seq.length (length);
 
-  if (!CORBA::is_nil (request_processing.in ()))
+  u_int i = 0;
+  for (;
+       cp < eos && i < seq.length ();
+       i++)
     {
-      this->request_processing_ = request_processing->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
+      if (*cp == '\\')
+        {
+          // This is an escaped non-printable,
+          // so we decode the hex values into
+          // the sequence's octet
+          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
+          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
+          cp += 3;
+        }
+      else
+        // Copy it in
+        seq[i] = *cp++;
     }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  ACE_THROW (PortableServer::POA::InvalidPolicy ());
+  // Set the length appropriately
+  seq.length (i);
 }
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
@@ -3214,11 +2918,29 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 
 #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 (void)
+  : poa_impl_ (0),
+    object_id_ (),
+    object_key_ (0),
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+    cookie_ (0),
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+    servant_ (0),
+    operation_ (0),
+    orb_core_ (0),
+    previous_current_ (0)
+{
+}
+
+TAO_POA_Current::TAO_POA_Current (TAO_POA *impl,
+                                  const TAO_ObjectKey &key,
+                                  PortableServer::Servant servant,
+                                  const char *operation,
+                                  TAO_ORB_Core &orb_core)
   : poa_impl_ (impl),
     object_id_ (),
     object_key_ (&key),
@@ -3232,35 +2954,24 @@ TAO_POA_Current_Impl::TAO_POA_Current_Impl (TAO_POA *impl,
     servant_ (servant),
     operation_ (operation),
     orb_core_ (&orb_core),
-    previous_current_impl_ (0),
-    active_object_map_entry_ (0)
+    previous_current_ (0)
 {
   // Set the current context and remember the old one.
-  this->previous_current_impl_ = this->orb_core_->poa_current ().implementation (this);
+  this->previous_current_ = this->orb_core_->poa_current (this);
 }
 
-TAO_POA_Current_Impl::~TAO_POA_Current_Impl (void)
+TAO_POA_Current::~TAO_POA_Current (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)
+
+      ACE_TRY
         {
           PortableServer::POA_var poa = this->get_POA (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (LOCATOR);
+          ACE_TRY_CHECK;
 
           this->poa_impl_->servant_locator_->postinvoke (this->object_id (),
                                                          poa.in (),
@@ -3268,7 +2979,7 @@ TAO_POA_Current_Impl::~TAO_POA_Current_Impl (void)
                                                          this->cookie_,
                                                          this->servant_,
                                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (LOCATOR);
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -3279,99 +2990,40 @@ TAO_POA_Current_Impl::~TAO_POA_Current_Impl (void)
 
 #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_);
+  this->orb_core_->poa_current (this->previous_current_);
 }
 
 PortableServer::POA_ptr
 TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
+  if (!this->context_is_valid ())
     {
       ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                        0);
+                        PortableServer::POA::_nil ());
     }
 
-  return impl->get_POA (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::get_object_id (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
+  if (!this->context_is_valid ())
     {
       ACE_THROW_RETURN (PortableServer::Current::NoContext (),
                         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_;
+  // Create a new one and pass it back
+  return new PortableServer::ObjectId (this->object_id_);
 }
 
-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;
-}
 
 #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>;
@@ -3431,12 +3083,7 @@ template class auto_ptr<TAO_POA>;
 template class auto_ptr<TAO_Active_Object_Map>;
 template class auto_ptr<TAO_POA_Manager>;
 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_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>
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index fdd7869cf80..2a8772556cd 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -57,18 +57,11 @@
 // 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;
 
 #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,
@@ -94,8 +87,7 @@ protected:
 
 #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,
@@ -119,8 +111,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,
@@ -144,8 +135,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,
@@ -171,8 +161,7 @@ protected:
 
 #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,
@@ -196,8 +185,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,
@@ -221,8 +209,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,
@@ -359,17 +346,14 @@ 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;
+  friend class TAO_POA_Current;
 
   typedef ACE_CString String;
 
@@ -488,9 +472,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);
 
@@ -504,7 +488,6 @@ public:
            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);
 
@@ -568,15 +551,9 @@ protected:
                                   PortableServer::Servant p_servant,
                                   CORBA_Environment &ACE_TRY_ENV);
 
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Environment &ACE_TRY_ENV);
-
   void deactivate_object_i (const PortableServer::ObjectId &oid,
                             CORBA_Environment &ACE_TRY_ENV);
 
-  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                        CORBA::Environment &ACE_TRY_ENV);
-
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA_Environment &ACE_TRY_ENV);
 
@@ -645,7 +622,7 @@ protected:
 
   PortableServer::Servant locate_servant_i (const char *operation,
                                             const PortableServer::ObjectId &id,
-                                            TAO_POA_Current_Impl *poa_current_impl,
+                                            TAO_POA_Current *poa_current,
                                             CORBA_Environment &ACE_TRY_ENV);
 
   const TAO_Creation_Time &creation_time (void);
@@ -680,18 +657,6 @@ protected:
 
   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);
-
   String name_;
 
   TAO_Object_Adapter::poa_name folded_name_;
@@ -716,7 +681,7 @@ protected:
 
   PortableServer::ServantLocator_var servant_locator_;
 
-  PortableServer::ServantBase_var default_servant_;
+  PortableServer::Servant default_servant_;
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -727,6 +692,8 @@ protected:
 
   ACE_Lock &lock_;
 
+  int closing_down_;
+
   int persistent_;
 
   int system_id_;
@@ -734,16 +701,6 @@ protected:
   TAO_Creation_Time creation_time_;
 
   TAO_ORB_Core &orb_core_;
-
-  CORBA::Boolean cleanup_in_progress_;
-
-  CORBA::Boolean etherealize_objects_;
-
-  CORBA::ULong outstanding_requests_;
-
-  ACE_SYNCH_CONDITION outstanding_requests_condition_;
-
-  CORBA::Boolean destroy_pending_;
 };
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
@@ -761,51 +718,31 @@ public:
 
 class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
 {
-public:
-
-  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.
-
-  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.
-
-  TAO_POA_Current_Impl *implementation (void);
-  // Returns the class that implements this interface.
-
-  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.
-};
-
-class TAO_Export TAO_POA_Current_Impl
-{
   // = 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:
 
   friend class TAO_POA;
 
+  // = Specification-mandated methods
+
   PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV);
   // Return pointer to the invoking POA.  Raises the
   // <CORBA::NoContext> exception.
@@ -816,6 +753,17 @@ public:
   // the guise of multiple object ids.  This has _out semantics Raises
   // the <CORBA::NoContext> exception.
 
+  // = TAO Extensions
+
+  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.
+
+  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.
+
   void POA_impl (TAO_POA *impl);
   // Set the POA implementation.
 
@@ -840,6 +788,9 @@ public:
   PortableServer::Servant servant (void) const;
   // Get the servant for the current upcall.
 
+  int in_upcall (void) const;
+  // Get whether we're in an upcall (non-zero is yes).
+
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
   PortableServer::ServantLocator::Cookie locator_cookie (void) const;
@@ -850,20 +801,17 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
-  // Set the <active_object_map_entry>.
+  TAO_POA_Current (void);
+  // Constructor
 
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
-  // Get the <active_object_map_entry>.
-
-  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,
+                   PortableServer::Servant servant,
+                   const char *operation,
+                   TAO_ORB_Core &orb_core);
   // Convenience constructor combining construction & initialization.
 
-  ~TAO_POA_Current_Impl (void);
+  ~TAO_POA_Current (void);
   // Destructor
 
 protected:
@@ -871,9 +819,7 @@ protected:
   // 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.
+  // The object ID of the current context.
 
   const TAO_ObjectKey *object_key_;
   // The object key of the current context.
@@ -894,16 +840,12 @@ protected:
   TAO_ORB_Core *orb_core_;
   // ORB Core for this current.
 
-  TAO_POA_Current_Impl *previous_current_impl_;
+  TAO_POA_Current *previous_current_;
   // 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..6982d57e2b5 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -596,124 +596,100 @@ TAO_POA::root_key_type_length (void)
   return sizeof (char);
 }
 
-ACE_INLINE CORBA::ULong
-TAO_POA::outstanding_requests (void) const
-{
-  return this->outstanding_requests_;
-}
-
 ACE_INLINE void
-TAO_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
+TAO_POA_Current::clear (void)
 {
-  this->outstanding_requests_ = new_outstanding_requests;
-}
+  this->poa_impl_ = 0;
+  this->object_id_.length (0);
+  this->object_key_ = 0;
 
-ACE_INLINE CORBA::ULong
-TAO_POA::increment_outstanding_requests (void)
-{
-  return ++this->outstanding_requests_;
-}
+#if !defined (TAO_HAS_MINIMUM_CORBA)
 
-ACE_INLINE CORBA::ULong
-TAO_POA::decrement_outstanding_requests (void)
-{
-  return --this->outstanding_requests_;
-}
+  this->cookie_ = 0;
 
-ACE_INLINE void
-TAO_POA::establish_servant_lock (PortableServer::Servant servant)
-{
-#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->orb_core_ = 0;
+  this->previous_current_ = 0;
+  this->servant_ = 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_.length () != 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;
 }
 
 ACE_INLINE const PortableServer::ObjectId &
-TAO_POA_Current_Impl::object_id (void) const
+TAO_POA_Current::object_id (void) const
 {
   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_;
 }
 
+ACE_INLINE int
+TAO_POA_Current::in_upcall (void) const
+{
+  return (this->servant_ != 0);
+}
+
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 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/POAC.cpp b/TAO/tao/POAC.cpp
index 0c01038e988..a8141979cd6 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -268,39 +268,33 @@ 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:omg.org/PortableServer/ThreadPolicy:1.0", env))
     return PortableServer::ThreadPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_ThreadPolicy(
       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 _tao_retval = (PortableServer::ThreadPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -326,7 +320,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -334,10 +328,9 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env
   }
   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);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -403,39 +396,33 @@ 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:omg.org/PortableServer/LifespanPolicy:1.0", env))
     return PortableServer::LifespanPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_LifespanPolicy(
       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 _tao_retval = (PortableServer::LifespanPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -461,7 +448,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA:
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -471,10 +458,9 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA:
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -538,39 +524,33 @@ 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:omg.org/PortableServer/IdUniquenessPolicy:1.0", env))
     return PortableServer::IdUniquenessPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy(
       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 _tao_retval = (PortableServer::IdUniquenessPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -596,7 +576,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -606,10 +586,9 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -672,39 +651,33 @@ 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:omg.org/PortableServer/IdAssignmentPolicy:1.0", env))
     return PortableServer::IdAssignmentPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy(
       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 _tao_retval = (PortableServer::IdAssignmentPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -730,7 +703,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -740,10 +713,9 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -809,39 +781,33 @@ 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:omg.org/PortableServer/ImplicitActivationPolicy:1.0", env))
     return PortableServer::ImplicitActivationPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy(
       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 _tao_retval = (PortableServer::ImplicitActivationPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -867,7 +833,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -877,10 +843,9 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -944,39 +909,33 @@ 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:omg.org/PortableServer/ServantRetentionPolicy:1.0", env))
     return PortableServer::ServantRetentionPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy(
       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 _tao_retval = (PortableServer::ServantRetentionPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1002,7 +961,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1012,10 +971,9 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -1079,39 +1037,33 @@ 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:omg.org/PortableServer/RequestProcessingPolicy:1.0", env))
     return PortableServer::RequestProcessingPolicy::_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/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 */
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy(
       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 _tao_retval = (PortableServer::RequestProcessingPolicyValue)0;
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1137,7 +1089,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -1147,10 +1099,9 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (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)
 {
@@ -1205,7 +1156,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
     return PortableServer::POAManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POAManager::_nil ());
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POAManager::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1392,7 +1343,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
     return PortableServer::AdapterActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::AdapterActivator::_nil ());
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::AdapterActivator::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1453,7 +1404,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
     return PortableServer::ServantManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantManager::_nil ());
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantManager::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1514,7 +1465,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
     return PortableServer::ServantActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantActivator::_nil ());
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantActivator::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1576,7 +1527,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
     return PortableServer::ServantLocator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantLocator::_nil ());
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantLocator::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1640,7 +1591,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow (
     return PortableServer::POA::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ());
 
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -3224,7 +3175,7 @@ CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_Portabl
 
 PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
+  ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ());
 }
 
 PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
@@ -3238,7 +3189,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval);
@@ -3265,7 +3216,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -3275,7 +3226,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro
   if (!(
         (_tao_in >> *_tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 24cc2967911..dd7584b98da 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -33,16 +33,12 @@
 #endif /* _MSC_VER */
 
 class TAO_ServantBase;
-class TAO_ServantBase_var;
-class TAO_RefCountServantBase;
 class TAO_Local_ServantBase;
 class TAO_DynamicImplementation;
 
 TAO_NAMESPACE PortableServer{
 
   typedef TAO_ServantBase ServantBase;
-  typedef TAO_ServantBase_var ServantBase_var;
-  typedef TAO_RefCountServantBase RefCountServantBase;
   typedef ServantBase *Servant;
 
   typedef TAO_Local_ServantBase LocalServantBase;
@@ -339,11 +335,7 @@ TAO_NAMESPACE PortableServer{
     static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -448,11 +440,7 @@ TAO_NAMESPACE PortableServer{
     static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -557,11 +545,7 @@ TAO_NAMESPACE PortableServer{
     static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -666,11 +650,7 @@ TAO_NAMESPACE PortableServer{
     static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -778,11 +758,7 @@ TAO_NAMESPACE PortableServer{
     static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -892,11 +868,7 @@ TAO_NAMESPACE PortableServer{
     static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -1007,11 +979,7 @@ TAO_NAMESPACE PortableServer{
     static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_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;
   protected:
@@ -2281,20 +2249,13 @@ TAO_NAMESPACE PortableServer{
 #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
@@ -2313,9 +2274,6 @@ 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
@@ -2335,36 +2293,22 @@ 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 *&);
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index e5797af0bd8..5b6a45ee813 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -3103,7 +3103,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Thread
     return 0;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -3152,7 +3151,6 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-#endif /* end #if !defined */
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
 {
@@ -3369,8 +3367,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Implic
     return 0;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -3419,8 +3415,6 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
-
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
@@ -3439,8 +3433,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Servan
     return 0;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -3490,8 +3482,6 @@ operator>> (
   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);
@@ -3509,8 +3499,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques
     return 0;
 }
 
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -3559,7 +3547,6 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
@@ -3584,8 +3571,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::A
     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
@@ -3607,7 +3592,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::A
   else
     return 0;
 }
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterNonExistent &_tao_aggregate)
 {
@@ -3667,8 +3651,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::I
     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
@@ -3690,7 +3672,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::N
   else
     return 0;
 }
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
 {
diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/POAManager.cpp
index c0c33655349..b5180a7843a 100644
--- a/TAO/tao/POAManager.cpp
+++ b/TAO/tao/POAManager.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/POAManager.h"
-#include "tao/POA.h"
+#include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/poa_macros.h"
+#include "tao/POAManager.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/POAManager.i"
@@ -141,9 +141,15 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
        ++iterator)
     {
       TAO_POA *poa = *iterator;
-      poa->deactivate_all_objects_i (etherealize_objects,
-                                     ACE_TRY_ENV);
+      poa->destroy (etherealize_objects,
+                    wait_for_completion,
+                    ACE_TRY_ENV);
       ACE_CHECK;
+
+      // poa->etherealize_servants (etherealize_objects,
+      //                            wait_for_completion,
+      //                            ACE_TRY_ENV);
+      // ACE_CHECK;
     }
 
   // If the wait_for_completion parameter is FALSE, this operation
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h
index e3b71040452..d4dea0e2eaf 100644
--- a/TAO/tao/POAManager.h
+++ b/TAO/tao/POAManager.h
@@ -72,10 +72,10 @@ protected:
                      CORBA::Boolean wait_for_completion,
                      CORBA_Environment &ACE_TRY_ENV);
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   PortableServer::POAManager::State get_state_i ();
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
   ACE_Lock &lock (void);
 
   int remove_poa (TAO_POA *poa);
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
index c8ce24fe58a..43cd7d77d3a 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/POAManager.i
@@ -52,8 +52,6 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                       ACE_TRY_ENV);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state_i (void)
 {
@@ -68,3 +66,5 @@ TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
 
   return this->get_state_i ();
 }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index a7b9ade3008..448f5629f12 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"
@@ -21,7 +20,6 @@ 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:
@@ -99,17 +97,13 @@ TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::lookup (const char *str, u
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable tao_PortableServer_ThreadPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -129,7 +123,7 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 }
 
 void POA_PortableServer::ThreadPolicy::_is_a_skel (
@@ -166,6 +160,20 @@ void POA_PortableServer::ThreadPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a (
+                                                        const char* value,
+                                                        CORBA::Environment &ACE_TRY_ENV
+                                                        )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::ThreadPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -186,21 +194,6 @@ void POA_PortableServer::ThreadPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a (
-                                                        const char* value,
-                                                        CORBA::Environment &ACE_TRY_ENV
-                                                        )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::ThreadPolicy::_downcast (
                                                    const char* logical_type_id
@@ -223,7 +216,7 @@ void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, voi
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -306,7 +299,6 @@ POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 
 #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:
@@ -384,17 +376,13 @@ TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::lookup (const char *str,
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable tao_PortableServer_LifespanPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -414,7 +402,7 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -452,6 +440,20 @@ void POA_PortableServer::LifespanPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a (
+                                                          const char* value,
+                                                          CORBA::Environment &ACE_TRY_ENV
+                                                          )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::LifespanPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -472,21 +474,6 @@ void POA_PortableServer::LifespanPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a (
-                                                          const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
-                                                          )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::LifespanPolicy::_downcast (
                                                      const char* logical_type_id
@@ -509,7 +496,7 @@ void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, v
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -589,7 +576,6 @@ POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV)
   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:
@@ -667,17 +653,13 @@ TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::lookup (const char *
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -697,7 +679,7 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -735,6 +717,20 @@ void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a (
+                                                              const char* value,
+                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::IdUniquenessPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -755,21 +751,6 @@ void POA_PortableServer::IdUniquenessPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a (
-                                                              const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::IdUniquenessPolicy::_downcast (
                                                          const char* logical_type_id
@@ -792,7 +773,7 @@ void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &re
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -872,7 +853,6 @@ POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
   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:
@@ -950,17 +930,13 @@ TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::lookup (const char *
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -980,7 +956,7 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1018,6 +994,20 @@ void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a (
+                                                              const char* value,
+                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::IdAssignmentPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -1038,21 +1028,6 @@ void POA_PortableServer::IdAssignmentPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a (
-                                                              const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::IdAssignmentPolicy::_downcast (
                                                          const char* logical_type_id
@@ -1075,7 +1050,7 @@ void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &re
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -1157,7 +1132,6 @@ POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 
 #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:
@@ -1235,17 +1209,13 @@ TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::lookup (const
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -1265,7 +1235,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1303,6 +1273,20 @@ void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a (
+                                                                    const char* value,
+                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -1323,21 +1307,6 @@ void POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a (
-                                                                    const char* value,
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
                                                                const char* logical_type_id
@@ -1360,7 +1329,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerReque
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -1440,7 +1409,6 @@ POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_E
   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:
@@ -1518,17 +1486,13 @@ TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::lookup (const ch
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -1548,7 +1512,7 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1586,6 +1550,20 @@ void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a (
+                                                                  const char* value,
+                                                                  CORBA::Environment &ACE_TRY_ENV
+                                                                  )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::ServantRetentionPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -1606,21 +1584,6 @@ void POA_PortableServer::ServantRetentionPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a (
-                                                                  const char* value,
-                                                                  CORBA::Environment &ACE_TRY_ENV
-                                                                  )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::ServantRetentionPolicy::_downcast (
                                                              const char* logical_type_id
@@ -1643,7 +1606,7 @@ void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -1723,7 +1686,6 @@ POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV
   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:
@@ -1801,17 +1763,13 @@ TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::lookup (const c
 }
 /* ending time is 0:12:47 */
 TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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,
@@ -1831,7 +1789,7 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -1869,6 +1827,20 @@ void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a (
+                                                                   const char* value,
+                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   )
+{
+  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))))
+    return 1;
+  else
+    return 0;
+}
+
 void POA_PortableServer::RequestProcessingPolicy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -1889,21 +1861,6 @@ void POA_PortableServer::RequestProcessingPolicy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a (
-                                                                   const char* value,
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  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))))
-    return 1;
-  else
-    return 0;
-}
 
 void* POA_PortableServer::RequestProcessingPolicy::_downcast (
                                                               const char* logical_type_id
@@ -1926,7 +1883,7 @@ void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerReques
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2008,9 +1965,55 @@ POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_EN
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
+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 &ACE_TRY_ENV
+                                                 )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_POAManager_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_POAManager_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::POAManager::_is_a (
@@ -2045,7 +2048,7 @@ void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2147,9 +2150,55 @@ POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV)
 
 #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 &ACE_TRY_ENV
+                                                       )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_AdapterActivator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_AdapterActivator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a (
@@ -2184,7 +2233,7 @@ void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req,
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2244,9 +2293,55 @@ POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV)
   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 &ACE_TRY_ENV
+                                                     )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_ServantManager_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantManager_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantManager::_is_a (
@@ -2281,7 +2376,7 @@ void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, v
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2328,9 +2423,55 @@ POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV)
   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 &ACE_TRY_ENV
+                                                       )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_ServantActivator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantActivator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantActivator::_is_a (
@@ -2368,7 +2509,7 @@ void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req,
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2448,9 +2589,55 @@ POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV)
   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 &ACE_TRY_ENV
+                                                     )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_ServantLocator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantLocator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantLocator::_is_a (
@@ -2488,7 +2675,7 @@ void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, v
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2574,9 +2761,55 @@ POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV)
 
 #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 &ACE_TRY_ENV
+                                          )
+{
+  //  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 (
+                                 ACE_TRY_ENV,
+                                 &PortableServer_POA_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (ACE_TRY_ENV.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV);
+  _tao_server_request.marshal (
+                               ACE_TRY_ENV,
+                               //                               _tao_skel_environment,
+                               &PortableServer_POA_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::POA::_is_a (
@@ -2611,7 +2844,7 @@ void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *contex
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -2994,9 +3227,164 @@ POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV)
   return new POA_PortableServer::_tao_collocated_POA (this, stub);
 }
 
+class TAO_PortableServer_Current_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 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_Current_Perfect_Hash_OpTable -N lookup  */
+unsigned int
+TAO_PortableServer_Current_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15,  0, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15,  0, 15,  0, 15, 15,
+      1, 15, 15,  0, 15, 15, 15, 15, 15, 15,
+     15, 15, 15, 15, 15, 15,  0, 15, 15, 15,
+     15, 15, 15, 15, 15, 15, 15, 15,
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
+
+const class TAO_operation_db_entry *
+TAO_PortableServer_Current_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 4,
+      MIN_WORD_LENGTH = 5,
+      MAX_WORD_LENGTH = 13,
+      MIN_HASH_VALUE = 5,
+      MAX_HASH_VALUE = 14,
+      HASH_VALUE_RANGE = 10,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",}, {"",}, {"",}, {"",}, {"",},
+      {"_is_a",  &POA_PortableServer::Current::_is_a_skel},
+      {"",},
+      {"get_POA", 	&POA_PortableServer::Current::get_POA_skel},
+      {"",}, {"",}, {"",}, {"",}, {"",},
+      {"_non_existent",  &POA_PortableServer::Current::_non_existent_skel},
+      {"get_object_id", 	&POA_PortableServer::Current::get_object_id_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_Current_Perfect_Hash_OpTable tao_PortableServer_Current_optable;
+
 // 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 &ACE_TRY_ENV
+                                                )
+{
+  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
+  PortableServer::POA_var _tao_retval;
+  _tao_retval = _tao_impl->get_POA (
+    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 (CORBA::COMPLETED_NO) );
+
+}
+
+void POA_PortableServer::Current::get_object_id_skel (
+                                                      CORBA::ServerRequest &_tao_server_request,
+                                                      void *_tao_object_reference,
+                                                      void * /* context */,
+                                                      CORBA::Environment &ACE_TRY_ENV
+                                                      )
+{
+  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
+  PortableServer::ObjectId_var _tao_retval;
+  _tao_retval = _tao_impl->get_object_id (
+    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 (CORBA::COMPLETED_NO) );
+
+}
+
+void POA_PortableServer::Current::_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 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;
+  CORBA::String_var _tao_value;
+  _tao_server_request.demarshal (
+    ACE_TRY_ENV,
+    &PortableServer_Current_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_Current_is_a_calldata,
+    &_tao_retval,
+    &_tao_value.inout ()
+  );
 }
 
 CORBA::Boolean POA_PortableServer::Current::_is_a (
@@ -3013,6 +3401,27 @@ CORBA::Boolean POA_PortableServer::Current::_is_a (
     return 0;
 }
 
+void POA_PortableServer::Current::_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_Current_non_existent_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_Current_non_existent_calldata =
+  {"_non_existent", 1, 1, PortableServer_Current_non_existent_paramdata};
+  CORBA::Boolean _tao_retval = 0;
+  _tao_server_request.marshal (
+    ACE_TRY_ENV,
+    &PortableServer_Current_non_existent_calldata,
+    &_tao_retval
+  );
+}
+
 void* POA_PortableServer::Current::_downcast (
                                               const char* logical_type_id
                                               )
@@ -3034,7 +3443,7 @@ void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *co
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index 0652bb63e2d..a7642e1e526 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -50,7 +50,6 @@ 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 ());
@@ -61,15 +60,14 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -128,8 +126,6 @@ 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 ());
@@ -140,15 +136,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -207,8 +203,6 @@ 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 ());
@@ -219,15 +213,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -286,8 +280,6 @@ 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 ());
@@ -298,15 +290,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -367,8 +359,6 @@ 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 ());
@@ -379,15 +369,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -446,8 +436,6 @@ 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 ());
@@ -458,15 +446,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -525,8 +513,6 @@ 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 ());
@@ -537,15 +523,15 @@ TAO_NAMESPACE POA_PortableServer
 
     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;
@@ -619,6 +605,8 @@ TAO_NAMESPACE POA_PortableServer
 
     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 ());
 
     PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -691,6 +679,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 ());
@@ -741,6 +731,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 ());
 
@@ -791,6 +782,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 ());
@@ -858,6 +851,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 ());
@@ -992,6 +987,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 ());
@@ -1173,8 +1170,14 @@ 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 ());
+
+    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 &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
index ea63bcf1531..11737821b4b 100644
--- a/TAO/tao/POAS.i
+++ b/TAO/tao/POAS.i
@@ -14,8 +14,6 @@ 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,7 +29,6 @@ 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 */
 
@@ -40,8 +37,6 @@ 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 +52,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 +72,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,7 +92,6 @@ 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)
 
@@ -114,8 +100,6 @@ 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 +115,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 +135,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,7 +155,6 @@ 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 */
 
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 5572d879cf1..e18670f0b21 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -10,7 +10,7 @@
 //   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.
+//   PollableS.h and DynAnyS.h files which have been removed.
 //
 // = AUTHOR
 //
@@ -32,7 +32,6 @@
 #include "tao/CurrentC.h"
 #include "tao/PolicyC.h"
 #include "tao/DynAnyC.h"
-#include "tao/DomainC.h"
 #include "tao/Servant_Base.h"
 #if defined(TAO_POLLER)
 #include "tao/PollableC.h"
@@ -61,6 +60,7 @@ public:
     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 &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
@@ -102,28 +102,15 @@ public:
   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 +118,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 +128,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,
@@ -160,7 +153,6 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
@@ -231,12 +223,44 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       ) = 0;
+    static void get_policy_overrides_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_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 ()
       ) = 0;
+    static void set_policy_overrides_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,
@@ -291,136 +315,78 @@ public:
   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 ()
       );
-
     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 (
+    static void _is_a_skel (
+        CORBA::ServerRequest &req,
+        void *obj,
+        void *context,
         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,
+    static void _non_existent_skel (
+        CORBA::ServerRequest &req,
+        void *obj,
+        void *context,
         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 (
+    static void get_policy_overrides_skel (
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
+        CORBA::Environment &env =
+          CORBA::Environment::default_environment ()
       );
 
-        static void _non_existent_skel (
+    static void set_policy_overrides_skel (
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
+        CORBA::Environment &env =
+          CORBA::Environment::default_environment ()
       );
 
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
+        CORBA::Environment &ACE_TRY_ENV =
+          CORBA::Environment::default_environment ()
       );
 
-    CORBA::DomainManager *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
+    CORBA::PolicyCurrent *_this (
+        CORBA::Environment &ACE_TRY_ENV =
+          CORBA::Environment::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
+  class TAO_Export _tao_collocated_PolicyCurrent     : public virtual CORBA::PolicyCurrent,
+      public virtual _tao_collocated_PolicyManager,
+      public virtual _tao_collocated_Current
   {
   public:
-    _tao_collocated_DomainManager (
-        DomainManager_ptr  servant,
+    _tao_collocated_PolicyCurrent (
+        PolicyCurrent_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 ()
+    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:
-    DomainManager_ptr servant_;
+    PolicyCurrent_ptr servant_;
   };
 
   // ****************************************************************
@@ -723,7 +689,7 @@ public:
     virtual const char* _interface_repository_id (void) const;
   };
 
-  class TAO_Export _tao_collocated_PollableSet : public virtual CORBA::PollableSet
+  class TAO_Export _tao_collocated_PollableSet     : public virtual CORBA::PollableSet
   {
   public:
     _tao_collocated_PollableSet (
@@ -1035,13 +1001,17 @@ public:
 
 };
 
+
+#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
-     );
+    );
   DynAny_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
@@ -1051,7 +1021,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 +1210,11 @@ private:
   DynAny_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
+
 class DynEnum;
 typedef DynEnum *DynEnum_ptr;
 class TAO_Export DynEnum : public virtual DynAny
@@ -1299,6 +1274,10 @@ public:
 
 };
 
+
+#if !defined (_CORBA_DYNENUM___COLLOCATED_SH_)
+#define _CORBA_DYNENUM___COLLOCATED_SH_
+
 class  _tao_collocated_DynEnum : public virtual CORBA_DynEnum,
     public virtual _tao_collocated_DynAny
 {
@@ -1336,6 +1315,10 @@ private:
   DynEnum_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynStruct;
 typedef DynStruct *DynStruct_ptr;
 class TAO_Export DynStruct : public virtual DynAny
@@ -1363,13 +1346,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;
@@ -1394,6 +1377,10 @@ public:
 
 };
 
+
+#if !defined (_CORBA_DYNSTRUCT___COLLOCATED_SH_)
+#define _CORBA_DYNSTRUCT___COLLOCATED_SH_
+
 class  _tao_collocated_DynStruct : public virtual CORBA_DynStruct,
     public virtual _tao_collocated_DynAny
 {
@@ -1416,12 +1403,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 +1417,10 @@ private:
   DynStruct_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynUnion;
 typedef DynUnion *DynUnion_ptr;
 class TAO_Export DynUnion : public virtual DynAny
@@ -1509,6 +1500,10 @@ public:
 
 };
 
+
+#if !defined (_CORBA_DYNUNION___COLLOCATED_SH_)
+#define _CORBA_DYNUNION___COLLOCATED_SH_
+
 class  _tao_collocated_DynUnion : public virtual CORBA_DynUnion,
     public virtual _tao_collocated_DynAny
 {
@@ -1562,6 +1557,10 @@ private:
   DynUnion_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynSequence;
 typedef DynSequence *DynSequence_ptr;
 class TAO_Export DynSequence : public virtual DynAny
@@ -1590,13 +1589,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;
@@ -1629,6 +1628,10 @@ public:
 
 };
 
+
+#if !defined (_CORBA_DYNSEQUENCE___COLLOCATED_SH_)
+#define _CORBA_DYNSEQUENCE___COLLOCATED_SH_
+
 class  _tao_collocated_DynSequence : public virtual CORBA_DynSequence,
     public virtual _tao_collocated_DynAny
 {
@@ -1652,12 +1655,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 +1669,10 @@ private:
   DynSequence_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynArray;
 typedef DynArray *DynArray_ptr;
 class TAO_Export DynArray : public virtual DynAny
@@ -1683,13 +1690,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;
@@ -1714,6 +1721,10 @@ public:
 
 };
 
+
+#if !defined (_CORBA_DYNARRAY___COLLOCATED_SH_)
+#define _CORBA_DYNARRAY___COLLOCATED_SH_
+
 class  _tao_collocated_DynArray : public virtual CORBA_DynArray,
     public virtual _tao_collocated_DynAny
 {
@@ -1728,12 +1739,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 +1753,10 @@ 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 ()
-    );
-
-  };
-
-  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 /* end #if !defined */
 
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if defined(_MSC_VER)
 #pragma warning(default:4250)
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 051c17f07f4..3a1cd46767f 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -6,12 +6,6 @@
 #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)
 {
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index c732e529b18..52a04090472 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -21,6 +21,7 @@
 #define TAO_PLUGGABLE_H
 
 #include "tao/corbafwd.h"
+#include "tao/Typecode.h"
 
 // Forward declarations.
 class ACE_Addr;
@@ -181,9 +182,6 @@ class TAO_Export TAO_Profile
   //   @@ Fred, please fill in here.
   //
 public:
-  TAO_Profile (void);
-  // Constructor
-
   virtual CORBA::ULong tag (void) const = 0;
   // The tag, each concrete class will have a specific tag value.
   // @@ Fred, any reason this cannot be implemented in the base class?
@@ -242,11 +240,24 @@ public:
   // 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 void forward_to (TAO_MProfile *mprofiles) = 0;
+  // object will assume ownership for this object!!
+  // @@ Fred: this is a bit counterintuitive, the usual rules CORBA
+  //    are:
+  //    1) Memory passed to an operations is owned by the caller.
+  //    2) Memory returned from a call is owned by the caller.
+  //
+  //    C++ is more flexible about this but the common rule is:
+  //    1) Pointers returned are owned by the callee.
+  //    2) Pointers passed are owned by the caller.
+  //
+  //    One good thing about references it that it leaves no ambiguity
+  //    about this.
+  //    The principle of least surprize will recommend that you use
+  //    any of the approaches above, but not the protocol that you propose.
 
-  TAO_MProfile* forward_to (void);
-  // MProfile accessor
+  virtual TAO_MProfile *forward_to (void) = 0;
+  // copy of MProfile, user must delete.
 
   virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
                                         CORBA::Environment &env) = 0;
@@ -280,14 +291,11 @@ public:
   // @@ Fred: reference counting can be implemented in the base class!
 
 protected:
-  TAO_MProfile *forward_to_i (void);
+  virtual TAO_MProfile *forward_to_i (void) = 0;
   // 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_;
 };
 
 class TAO_Export TAO_Acceptor
@@ -317,9 +325,6 @@ public:
   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
 };
@@ -441,8 +446,4 @@ private:
   // 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/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index b4062def722..35fe452ad26 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -199,7 +199,7 @@ CORBA::PolicyType CORBA_Policy::policy_type (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -225,7 +225,7 @@ CORBA::PolicyType CORBA_Policy::policy_type (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -235,7 +235,7 @@ CORBA::PolicyType CORBA_Policy::policy_type (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -247,7 +247,7 @@ CORBA_Policy_ptr CORBA_Policy::copy (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -273,7 +273,7 @@ CORBA_Policy_ptr CORBA_Policy::copy (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -283,7 +283,7 @@ CORBA_Policy_ptr CORBA_Policy::copy (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -294,7 +294,7 @@ void CORBA_Policy::destroy (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO));
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -320,7 +320,7 @@ void CORBA_Policy::destroy (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES));
 
     }
     break;
@@ -446,7 +446,7 @@ CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides (
 {
   CORBA_PolicyList* _tao_retval = 0;
   ACE_UNUSED_ARG(_tao_retval);
-  ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+  ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 }
 
 void CORBA_PolicyManager::set_policy_overrides (
@@ -455,7 +455,7 @@ void CORBA_PolicyManager::set_policy_overrides (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 }
 
 CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &env)
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 079873eade6..1f4e66e3761 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -14,11 +14,9 @@
 #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:
@@ -94,14 +92,11 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 }
 /* ending time is 17:16:21 */
 TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 // 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
@@ -113,7 +108,6 @@ 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,
@@ -133,7 +127,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -156,7 +150,7 @@ void POA_CORBA::Policy::copy_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -209,6 +203,19 @@ void POA_CORBA::Policy::_is_a_skel (
   );
 }
 
+CORBA::Boolean POA_CORBA::Policy::_is_a (
+    const char* value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  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))))
+      return 1;
+    else
+      return 0;
+}
+
 void POA_CORBA::Policy::_non_existent_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * /* _tao_object_reference */ ,
@@ -229,20 +236,6 @@ void POA_CORBA::Policy::_non_existent_skel (
     &_tao_retval
   );
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_CORBA::Policy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  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))))
-      return 1;
-    else
-      return 0;
-}
 
 void* POA_CORBA::Policy::_downcast (
     const char* logical_type_id
@@ -262,7 +255,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
@@ -378,7 +371,7 @@ void* POA_CORBA::PolicyManager::_downcast (
 void POA_CORBA::PolicyManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   // @@ TODO
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const
@@ -493,7 +486,7 @@ void* POA_CORBA::PolicyCurrent::_downcast (
 
 void POA_CORBA::PolicyCurrent::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA_BAD_OPERATION ());
+  ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 7d61f7fdfe6..ab5aab9c9e4 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "tao/orbconf.h"
-
 #if defined (TAO_HAS_CORBA_MESSAGING)
 
 #include "tao/Policy_Manager.h"
@@ -22,7 +20,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides (
   // @@ 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 ());
+    ACE_THROW (CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
 
   CORBA::InvalidPolicies invalid_policies;
   invalid_policies.indices.length (policies.length ());
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 6b597093e0f..9c7641573ac 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -20,8 +20,6 @@
 #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"
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 9e4a8c926ae..029fec18db6 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -80,7 +80,7 @@ CORBA::Boolean CORBA_Pollable::is_ready (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -100,7 +100,7 @@ CORBA::Boolean CORBA_Pollable::is_ready (
     if (!(
           (_tao_out << timeout)
       ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 
     int _invoke_status =
       _tao_call.invoke (0, 0, ACE_TRY_ENV);
@@ -112,7 +112,7 @@ CORBA::Boolean CORBA_Pollable::is_ready (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -122,7 +122,7 @@ CORBA::Boolean CORBA_Pollable::is_ready (
   if (!(
         (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -134,7 +134,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -160,7 +160,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -170,7 +170,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -413,7 +413,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -439,7 +439,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -449,7 +449,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -461,7 +461,7 @@ void CORBA_PollableSet::add_pollable (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO));
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -481,7 +481,7 @@ void CORBA_PollableSet::add_pollable (
     if (!(
           (_tao_out << potential)
       ))
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
     int _invoke_status =
       _tao_call.invoke (0, 0, ACE_TRY_ENV);
@@ -493,7 +493,7 @@ void CORBA_PollableSet::add_pollable (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES));
 
     }
     break;
@@ -516,7 +516,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -536,7 +536,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll (
     if (!(
           (_tao_out << timeout)
       ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval);
 
     int _invoke_status =
       _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, ACE_TRY_ENV);
@@ -548,7 +548,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -558,7 +558,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
@@ -575,7 +575,7 @@ void CORBA_PollableSet::remove (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO));
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -595,7 +595,7 @@ void CORBA_PollableSet::remove (
     if (!(
           (_tao_out << potential)
       ))
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
     int _invoke_status =
       _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, ACE_TRY_ENV);
@@ -607,7 +607,7 @@ void CORBA_PollableSet::remove (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES));
 
     }
     break;
@@ -624,7 +624,7 @@ CORBA::UShort CORBA_PollableSet::number_left (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -650,7 +650,7 @@ CORBA::UShort CORBA_PollableSet::number_left (
       // cannot happen
     if (_invoke_status != TAO_INVOKE_OK)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval);
 
     }
     break;
@@ -660,7 +660,7 @@ CORBA::UShort CORBA_PollableSet::number_left (
   if (!(
         (_tao_in >> _tao_retval)
     ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
 
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
index 08f791e08a7..b2f0e9c5b99 100644
--- a/TAO/tao/PollableS.cpp
+++ b/TAO/tao/PollableS.cpp
@@ -129,7 +129,7 @@ void POA_CORBA::Pollable::is_ready_skel (
   if (!(
     (_tao_in >> timeout)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
   _tao_retval = _tao_impl->is_ready (
     timeout,
@@ -142,7 +142,7 @@ void POA_CORBA::Pollable::is_ready_skel (
   if (!(
     (_tao_out << CORBA::Any::from_boolean (_tao_retval))
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -165,7 +165,7 @@ void POA_CORBA::Pollable::create_pollable_set_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -256,7 +256,7 @@ void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, C
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -501,7 +501,7 @@ void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
@@ -657,7 +657,7 @@ void POA_CORBA::PollableSet::create_dii_pollable_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -674,7 +674,7 @@ void POA_CORBA::PollableSet::add_pollable_skel (
   if (!(
     (_tao_in >> potential.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
   _tao_impl->add_pollable (
     potential.in (),
@@ -698,7 +698,7 @@ void POA_CORBA::PollableSet::poll_skel (
   if (!(
     (_tao_in >> timeout)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
   _tao_retval = _tao_impl->poll (
     timeout,
@@ -711,7 +711,7 @@ void POA_CORBA::PollableSet::poll_skel (
   if (!(
     (_tao_out << _tao_retval.in ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -728,7 +728,7 @@ void POA_CORBA::PollableSet::remove_skel (
   if (!(
     (_tao_in >> potential.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
   _tao_impl->remove (
     potential.in (),
@@ -757,7 +757,7 @@ void POA_CORBA::PollableSet::number_left_skel (
   if (!(
     (_tao_out << _tao_retval)
   ))
-    ACE_THROW (CORBA::MARSHAL () );
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) );
 
 }
 
@@ -848,7 +848,7 @@ void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context
   if (this->_find (opname, skel) == -1)
   {
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
   }
   else
     skel (req, this, context, ACE_TRY_ENV);
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index 4a76a26c868..be79982fca4 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -13,13 +13,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 +34,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 +42,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);
@@ -131,278 +110,4 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
                          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;
-}
-
-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..11c857bd456 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -15,7 +15,6 @@
 //
 // = AUTHOR
 //     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -29,9 +28,6 @@
 #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 +54,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.
@@ -88,7 +74,7 @@ public:
   CORBA_Any &return_value (void);
 
   void invoke (CORBA::Environment &ACE_TRY_ENV =
-                 CORBA::Environment::default_environment ());
+               CORBA::Environment::default_environment ());
   // 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
@@ -99,18 +85,10 @@ public:
   // as the user may not be able to propagate the exceptions
 
   void send_oneway (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
+                    CORBA::Environment::default_environment ());
   // 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 ());
+  // as the user may not be able to propagate the exceptions
 
   // Pseudo object methods
   static CORBA_Request* _duplicate (CORBA_Request*);
@@ -135,14 +113,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 +135,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,144 +216,6 @@ 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__ */
diff --git a/TAO/tao/Request.i b/TAO/tao/Request.i
index 6b3d8e56b87..314c55864f2 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,55 +25,53 @@ 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 *
+/*ACE_INLINE CORBA::Environment *
 CORBA_Request::env (void) 
 {
-  return &this->env_; 
+  return &env_; 
 }
-
+*/
 // The argument manipulation helper functions
 
 ACE_INLINE CORBA_Any &
@@ -125,18 +129,6 @@ 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
 // *************************************************************
@@ -297,5 +289,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..becea24117f 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -432,12 +432,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.i b/TAO/tao/Sequence_T.i
index 35c7c972afe..0a43b5b986b 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_)
 {
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index 8c6633a173f..0beb4b36d89 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"
@@ -18,16 +17,16 @@ ACE_RCSID(tao, Servant_Base, "$Id$")
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Servant_Base_Timeprobe_Description[] =
-{
-  "Servant_Base::_find - start",
-  "Servant_Base::_find - end"
-};
+  {
+    "Servant_Base::_find - start",
+    "Servant_Base::_find - end"
+  };
 
 enum
-{
-  TAO_SERVANT_BASE_FIND_START = 700,
-  TAO_SERVANT_BASE_FIND_END
-};
+  {
+    TAO_SERVANT_BASE_FIND_START = 700,
+    TAO_SERVANT_BASE_FIND_END
+  };
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
@@ -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,12 +70,6 @@ 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,
@@ -115,13 +92,13 @@ TAO_ServantBase::_create_stub (CORBA_Environment &env)
   TAO_Stub *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 (),
+      stub = orb_core->orb ()->create_stub_object (poa_current->object_key (),
                                                    this->_interface_repository_id (),
                                                    env);
     }
@@ -146,160 +123,6 @@ 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 *
 TAO_Local_ServantBase::_create_stub (CORBA_Environment &env)
 {
@@ -357,28 +180,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);
 }
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index d4bcae36244..2b6cb2e72cb 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,29 @@ 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 TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
 protected:
@@ -66,12 +57,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
@@ -90,127 +82,9 @@ protected:
   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.
-
   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,7 +99,7 @@ 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 ());
+  TAO_Stub *_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
 };
@@ -244,19 +118,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,12 +141,12 @@ 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 TAO_Stub *_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.
 };
 
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
index f94cd6709cf..95aceb59a51 100644
--- a/TAO/tao/Server_Request.cpp
+++ b/TAO/tao/Server_Request.cpp
@@ -19,3 +19,610 @@
 
 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)
+  : 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
+IIOP_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 (CORBA::COMPLETED_NO));
+
+}
+
+void
+IIOP_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 (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,
+                                        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)
+{
+}
+
+IIOP_ServerRequest::~IIOP_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
+IIOP_ServerRequest::orb (void)
+{
+  return this->orb_core_->orb ();
+}
+
+TAO_POA *
+IIOP_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
+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;
+
+      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,
+                      "IIOP_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,
+                         0,
+                         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,
+                  "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;
+      }
+   }
+}
+
+// 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 ();
+	        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
+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);
+            }
+        }
+      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_ << 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,
+                      "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
+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..e6f7088431c 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -195,6 +195,178 @@ public:
 
 };
 
+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,
+                      const ACE_CString &operation,
+                      TAO_OutputCDR &output,
+                      TAO_ORB_Core *orb_core,
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual ~IIOP_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 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:
+  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/Server_Request.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
index 808df8fd876..345a30bf693 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,69 @@ 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_.c_str ();
+}
+
+// get the length of the operation name.
+ACE_INLINE unsigned int
+IIOP_ServerRequest::operation_length (void) const
+{
+  return this->operation_.length ();
+}
+
+#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..766cc35bfb6 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -14,7 +14,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 +43,10 @@ TAO_Server_Strategy_Factory::scheduling_strategy (void)
   return 0;
 }
 
-int
-TAO_Server_Strategy_Factory::enable_poa_locking (void)
+ACE_Lock *
+TAO_Server_Strategy_Factory::create_poa_lock (void)
 {
-  return -1;
+  return 0;
 }
 
 ACE_Lock *
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 3618634884f..8d96cf643c6 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -24,7 +24,6 @@
 
 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
 {
@@ -80,7 +79,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 +109,8 @@ public:
   virtual SCHEDULING_STRATEGY *scheduling_strategy (void);
   // Return the scheduling strategy used.
 
-  virtual int enable_poa_locking (void);
-  // Enable POA locking?
+  virtual ACE_Lock *create_poa_lock (void);
+  // Return a new lock for use in locking the POA.
 
   virtual ACE_Lock *create_servant_lock (void);
   // Return a new lock for use in locking the servant.
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..d838d834eef 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -61,7 +61,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_TAO_Stub_Timeprobe_Description,
 #endif /* ACE_ENABLE_TIMEPROBES */
 
 TAO_Stub::TAO_Stub (char *repository_id,
-                    const TAO_MProfile &profiles,
+                    TAO_MProfile &profiles,
                     TAO_ORB_Core* orb_core)
   : type_id (repository_id),
     base_profiles_ ((CORBA::ULong) 0),
@@ -92,9 +92,86 @@ TAO_Stub::TAO_Stub (char *repository_id,
   this->profile_lock_ptr_ =
     this->orb_core_->client_factory ()->create_iiop_profile_lock ();
 
+  this->set_base_profiles (&profiles);
+}
+
+TAO_Stub::TAO_Stub (char *repository_id,
+                    TAO_MProfile *profiles,
+                    TAO_ORB_Core* orb_core)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    forward_profiles_ (0),
+    profile_in_use_ (0),
+    profile_lock_ptr_ (0),
+    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 (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 ();
+    }
+
+  // @@ does this need to be freed?
+  this->profile_lock_ptr_ =
+    this->orb_core_->client_factory ()->create_iiop_profile_lock ();
+
   this->set_base_profiles (profiles);
 }
 
+#if 0
+TAO_Stub::TAO_Stub (char *repository_id,
+                    TAO_Profile *profile)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    forward_profiles_ (0),
+    profile_in_use_ (0),
+    profile_lock_ptr_ (0),
+    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_ =
+    this->orb_core_->client_factory ()->create_iiop_profile_lock ();
+
+  base_profiles_.set (1);
+
+  base_profiles_.give_profile (profile);
+
+  reset_base ();
+
+}
+
+TAO_Stub::TAO_Stub (char *repository_id)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    forward_profiles_ (0),
+    profile_in_use_ (0),
+    profile_lock_ptr_ (0),
+    profile_success_ (0),
+    // what about ACE_SYNCH_MUTEX refcount_lock_
+    refcount_ (1),
+    use_locate_request_ (0),
+    first_locate_request_ (0)
+{
+  this->profile_lock_ptr_ =
+    this->orb_core_->client_factory ()->create_iiop_profile_lock ();
+}
+#endif /* 0 */
+
 // Quick'n'dirty hash of objref data, for partitioning objrefs into
 // sets.
 //
@@ -104,7 +181,7 @@ TAO_Stub::TAO_Stub (char *repository_id,
 //    can get different values, depending on the profile_in_use!!
 CORBA::ULong
 TAO_Stub::hash (CORBA::ULong max,
-                CORBA::Environment &env)
+                   CORBA::Environment &env)
 {
   // we rely on the profile object to has it's address info
   if (profile_in_use_)
@@ -112,6 +189,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
@@ -121,7 +219,7 @@ TAO_Stub::hash (CORBA::ULong max,
 // @@ 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)
+                            CORBA::Environment &env)
 {
   if (CORBA::is_nil (other_obj) == 1)
     return 0;
@@ -302,7 +400,7 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
             return; // Shouldn't happen
 
           if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE));
 
           // The only case left is status == TAO_INVOKE_OK, exit the
           // loop.  We cannot retry because at this point we either
@@ -405,7 +503,7 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
             return; // Shouldn't happen
 
           if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE));
 
           break;
         }
@@ -509,7 +607,7 @@ TAO_Stub::do_dynamic_call (const char *opname,
             return; // Shouldn't happen
 
           if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE));
 
           // The only case left is status == TAO_INVOKE_OK, exit the
           // loop.  We cannot retry because at this point we either
@@ -693,7 +791,7 @@ TAO_Stub::do_dynamic_call (const char *opname,
             return; // Shouldn't happen
 
           if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE));
 
           break;
         }
@@ -810,7 +908,9 @@ TAO_Stub::set_policy_overrides (
     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);
+  auto_ptr<TAO_Policy_Manager_Impl> policy_manager =
+    auto_ptr<TAO_Policy_Manager_Impl> (new TAO_Policy_Manager_Impl);
+
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
@@ -837,7 +937,7 @@ TAO_Stub::set_policy_overrides (
 
   TAO_Stub* stub;
   ACE_NEW_RETURN (stub, TAO_Stub (CORBA::string_dup (this->type_id.in ()),
-                                  this->base_profiles_,
+                                  this->get_profiles (),
                                   this->orb_core_),
                   0);
   stub->policies_ = policy_manager.release ();
@@ -865,33 +965,6 @@ TAO_Stub::validate_connection (
   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>;
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index d1509c76a92..15685eb7c38 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -43,10 +43,6 @@ class TAO_Policy_Manager_Impl;
 
 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
@@ -309,7 +305,13 @@ public:
   // Our Constructors ...
 
   TAO_Stub (char *repository_id,
-            const TAO_MProfile &profiles,
+            TAO_MProfile *profiles,
+            TAO_ORB_Core *orb_core);
+  // Construct from a repository ID and a pointer to list of
+  // profiles. Assumes ownership of the profiles.
+
+  TAO_Stub (char *repository_id,
+            TAO_MProfile &profiles,
             TAO_ORB_Core *orb_core);
   // Construct from a repository ID and a list of profiles.
 
@@ -366,11 +368,11 @@ public:
    // returns TRUE if a connection was successful with at least
    // one profile.
 
-   TAO_Profile *set_base_profiles (const TAO_MProfile& mprofiles);
+   TAO_Profile *set_base_profiles (TAO_MProfile *mprofiles);
    // Initialize the base_profiles_ and set profile_in_use_ to
    // reference the first profile.
 
-  void add_forward_profiles (const TAO_MProfile &mprofiles);
+  void add_forward_profiles (TAO_MProfile *mprofiles);
   // THREAD SAFE.
   // set the forward_profiles.  This object will assume ownership of
   // this TAO_MProfile object!!
@@ -430,6 +432,10 @@ private:
   // 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 => TAO_Stub should also go away!
+  //    fredk
   TAO_MProfile     base_profiles_;
   // ordered list of profiles for this object.
   TAO_MProfile     *forward_profiles_;
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 242203aaba2..fff7c3cc209 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -72,8 +72,10 @@ ACE_INLINE
 void
 TAO_Stub::reset_forward (void)
 {
-  while (this->forward_profiles_ != 0)
+  while (forward_profiles_)
     forward_back_one ();
+
+  forward_profiles_ = 0;
 }
 
 ACE_INLINE
@@ -143,7 +145,7 @@ ACE_INLINE
 TAO_MProfile *
 TAO_Stub::get_profiles (void)
 {
-  return new TAO_MProfile (base_profiles_);
+  return new TAO_MProfile (&base_profiles_);
 }
 
 ACE_INLINE
@@ -152,8 +154,7 @@ TAO_Stub::next_forward_profile (void)
 {
   TAO_Profile *pfile_next = 0;
 
-  while (this->forward_profiles_
-         && (pfile_next = forward_profiles_->get_next ()) == 0)
+  while (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 ();
@@ -219,7 +220,7 @@ TAO_Stub::valid_profile (void)
 
 ACE_INLINE
 TAO_Profile *
-TAO_Stub::set_base_profiles (const TAO_MProfile &mprofiles)
+TAO_Stub::set_base_profiles (TAO_MProfile *mprofiles)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                             guard,
@@ -235,6 +236,31 @@ TAO_Stub::set_base_profiles (const TAO_MProfile &mprofiles)
 }
 
 ACE_INLINE
+void
+TAO_Stub::add_forward_profiles (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_));
+
+  // forwarded profile points to the new IOR (profiles)
+  profile_in_use_->forward_to (mprofiles);
+
+  TAO_MProfile *now_pfiles = forward_profiles_ ? forward_profiles_ : &base_profiles_;
+
+  // new profile list points back to the list which was forwarded.
+  mprofiles->forward_from (now_pfiles);
+
+  forward_profiles_ = mprofiles;
+
+  // make sure we start at the beginning of mprofiles
+  forward_profiles_->rewind ();
+
+}
+
+ACE_INLINE
 CORBA::Boolean
 TAO_Stub::next_profile_retry (void)
 {
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index 5bddd279377..90ee499c1eb 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -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
@@ -212,23 +195,6 @@ 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
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 631951b0991..f810891310a 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -216,8 +1778,540 @@ SOURCE=.\CDR.cpp
 

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -231,8 +2325,528 @@ SOURCE=.\CDR_Interpreter.cpp
 

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

 

+DEP_CPP_CDR_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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_I=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

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

 

+DEP_CPP_CDR_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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_I=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -246,8 +2860,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -261,29 +3395,548 @@ 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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

 

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.cpp

+SOURCE=.\Context.cpp

 

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

 

@@ -306,8 +3959,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -321,8 +4494,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -336,8 +5029,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -351,8 +5564,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -366,8 +6099,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -381,23 +6634,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -411,37 +7169,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

 

 !ENDIF 

 

@@ -456,8 +7704,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -471,8 +8253,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -486,8 +8788,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -501,8 +9323,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -516,8 +9860,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -531,8 +10397,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -546,8 +10934,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -561,8 +11471,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -576,8 +12012,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -591,8 +12547,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -606,8 +13082,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -621,8 +13617,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -636,23 +14154,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -726,8 +14763,528 @@ SOURCE=.\InconsistentTypeCodeC.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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -741,8 +15298,542 @@ SOURCE=.\Invocation.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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -786,8 +15877,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -801,37 +16412,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

 

 !ENDIF 

 

@@ -861,8 +16962,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -876,8 +17497,528 @@ SOURCE=.\Object.cpp
 

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -906,23 +18047,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -936,8 +18582,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -951,8 +19131,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -966,8 +19690,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -981,8 +20267,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1011,8 +20817,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1026,8 +21368,528 @@ SOURCE=.\POAC.cpp
 

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1056,23 +21918,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1086,8 +22453,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1101,8 +22988,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1116,8 +23523,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1131,23 +24058,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1161,8 +24593,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1176,8 +25128,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1191,8 +25677,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1206,23 +26226,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1236,8 +26761,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1251,8 +27296,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

+	".\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_=\

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1266,8 +27831,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1281,8 +28368,530 @@ SOURCE=.\TAO_Internal.cpp
 

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1326,8 +28935,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1341,44 +29470,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory.cpp

+SOURCE=.\Union.cpp

 

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

 

@@ -1386,37 +30005,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"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

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

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\CDR_Interpreter.h"\

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

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

+	".\align.h"\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	

 

 !ENDIF 

 

@@ -1463,10 +30572,6 @@ 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 +30584,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 +30632,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

@@ -1563,10 +30652,6 @@ SOURCE=.\InconsistentTypeCodeC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IOR_LookupTable.h

 # End Source File

 # Begin Source File

@@ -1579,14 +30664,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 +30676,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

@@ -1667,11 +30736,11 @@ 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 +30752,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 +30772,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 +30796,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"

 

@@ -1779,30 +30824,14 @@ 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 +30848,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 +30860,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 +30872,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

@@ -1887,10 +30900,6 @@ 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 +30920,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 +30934,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..065c2aaafd3 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,10 +72,6 @@ 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,
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index d13c7b405ba..360866a6a86 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -6,31 +6,21 @@
 #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;
+char *TAO_Internal::resource_factory_args_ = TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
+char *TAO_Internal::server_strategy_args_ = TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
+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;
+char *TAO_Internal::resource_factory_args_ = 0;
+char *TAO_Internal::server_strategy_args_ = 0;
+char *TAO_Internal::client_strategy_args_ = 0;
 #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
-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::open_services (int& argc, char** argv, int ignore_default_svc_conf)
 {
@@ -42,7 +32,7 @@ TAO_Internal::open_services (int& argc, char** argv, int ignore_default_svc_conf
   if (TAO_Internal::service_open_count_++ == 0)
     {
       ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Resource_Factory);
+        insert (&ace_svc_desc_TAO_Resource_Factory);
       ACE_Service_Config::static_svcs ()->
         insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory);
       ACE_Service_Config::static_svcs ()->
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index 41e2a5d6d15..7310a39fef1 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -61,9 +61,9 @@ private:
   // <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_;
+  static char *resource_factory_args_;
+  static char *server_strategy_args_;
+  static 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..b01e1e8ded5
--- /dev/null
+++ b/TAO/tao/TAO_Internal.i
@@ -0,0 +1,13 @@
+// -*- c++ -*-
+//
+// $Id$
+
+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;
+}
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 7d350fe13df..048ae73af2f 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

@@ -114,14 +114,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 +138,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 +194,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

@@ -242,14 +218,6 @@ SOURCE=.\Invocation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_LookupTable.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Key_Adapters.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.cpp

 # End Source File

 # Begin Source File

@@ -258,14 +226,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 +238,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

@@ -322,10 +278,6 @@ 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

@@ -400,22 +344,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"

 

@@ -458,10 +386,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 +394,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 +442,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

@@ -550,10 +462,6 @@ SOURCE=.\InconsistentTypeCodeC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -562,14 +470,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

@@ -582,10 +482,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

@@ -646,11 +542,11 @@ 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 +558,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 +578,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 +602,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 +626,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 +634,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 +654,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 +670,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

@@ -870,10 +714,6 @@ 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 +746,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 +762,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/Typecode.cpp b/TAO/tao/Typecode.cpp
index 2abaa4b6f2a..1fb8aa5cfc9 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -93,8 +93,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 +212,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 +219,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_ + ACE_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;
+      (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 +240,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 +531,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 +1240,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 +1284,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 +1310,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 +1369,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 +1383,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 +1404,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 +1436,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 +1467,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 +1476,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 +1533,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 +1580,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 +1626,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 +1656,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;
@@ -1737,7 +1709,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);
+    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), 0);
     }
 
   // Double checked locking...
@@ -1758,7 +1730,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
   CORBA::Any_ptr* label_list;
   ACE_NEW_THROW_EX (label_list,
                     CORBA::Any_ptr [member_count],
-                    CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
   // get the discriminant TC
@@ -1790,10 +1762,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
       // 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 ());
+      TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT);
 
       retval = out.append (tc, &stream, ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
@@ -1801,9 +1770,10 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
         return 0;
 
       // @@EXC@@ Need to check memory allocation failure.
+      ACE_Message_Block* mb = ACE_Message_Block::duplicate(out.begin ());
       ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (tc, 0, out.begin ()),
-                        CORBA::NO_MEMORY ());
+                        CORBA::Any (tc, mb),
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
 
       if (stream.skip_string () == 0
@@ -1814,7 +1784,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
                         "TypeCode::private_member_label "
                         "error getting typecode for member %d\n",
                         i));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO),
                             0);
         }
     }
@@ -1849,7 +1819,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 +1843,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 +1868,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 +1892,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 +1927,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 +1946,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 +1954,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;
@@ -2068,7 +2038,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 +2054,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 +2072,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 +2318,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 ();
 
@@ -2163,7 +2356,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,
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 9544a4cefb8..44ef3176627 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,16 +232,6 @@ 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.
@@ -276,122 +246,98 @@ 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 +474,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 +482,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..29c77522793 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -33,12 +33,6 @@
 #include "tao/Object_KeyC.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 */
@@ -48,30 +42,30 @@ 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,26 +77,12 @@ 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_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;
@@ -115,27 +95,17 @@ 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)
 {
@@ -201,7 +171,7 @@ TAO_TypeCodes::init (void)
                                             sizeof _oc_wstring,
                                             (char *) &_oc_wstring,
                                             1,
-                                            sizeof (CORBA::WChar*));
+                                            sizeof (CORBA::WString));
 
   //
   // Various things that can be passed as "general" parameters:
@@ -260,12 +230,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,707 +253,50 @@ 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_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[] =
-  {
-    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
-    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_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[] =
-  {
-    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,
-  };
-
- CORBA::_tc_ServiceInformation =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceInformation),
-                         (char *) &_oc_CORBA_ServiceInformation,
-                         0,
-                         sizeof (CORBA::ServiceInformation));
+  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_PolicyErrorCode[] =
   {
     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
+    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 =
@@ -996,48 +308,17 @@ TAO_TypeCodes::init (void)
 
   static const CORBA::Long _oc_CORBA_PolicyError[] =
   {
-    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,
+  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,
@@ -1048,31 +329,16 @@ TAO_TypeCodes::init (void)
 
   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,
+  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 =
@@ -1084,23 +350,10 @@ TAO_TypeCodes::init (void)
 
   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,
+  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,
@@ -1111,19 +364,9 @@ TAO_TypeCodes::init (void)
 
   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,
+  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,
@@ -1134,42 +377,18 @@ TAO_TypeCodes::init (void)
 
   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,
+  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,
@@ -1178,48 +397,22 @@ TAO_TypeCodes::init (void)
                         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,
+ 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,
  };
  CORBA::_tc_PolicyTypeSeq =
    new CORBA::TypeCode (CORBA::tk_alias,
@@ -1228,38 +421,15 @@ TAO_TypeCodes::init (void)
                         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
-  };
+ 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),
@@ -1267,26 +437,12 @@ TAO_TypeCodes::init (void)
                         0,
                         sizeof (CORBA::SetOverrideType));
 
-  static const CORBA::Long _oc_CORBA_PolicyManager[] =
+ 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,
-  };
+  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),
@@ -1294,26 +450,12 @@ TAO_TypeCodes::init (void)
                         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,
-  };
+ 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),
@@ -1321,107 +463,15 @@ TAO_TypeCodes::init (void)
                          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));
-
  // ****************************************************************
 
 #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,
-  };
+ 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),
@@ -1429,25 +479,12 @@ TAO_TypeCodes::init (void)
                         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,
-  };
+ 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),
@@ -1455,50 +492,25 @@ TAO_TypeCodes::init (void)
                         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,
-  };
+ 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));
+   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 +604,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 +706,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
index 09755f69a8d..f94c260d3ef 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 0
 #define TAO_MINOR_VERSION 3
-#define TAO_BETA_VERSION 23
-#define TAO_VERSION "0.3.23"
+#define TAO_BETA_VERSION 19
+#define TAO_VERSION "0.3.19"
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..0eca9668080 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -90,7 +90,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -119,11 +119,8 @@ 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)
     {
@@ -131,7 +128,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
         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));
     }
   return retval;
 }
@@ -205,7 +202,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
             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));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -218,7 +215,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -296,7 +293,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
     {
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -342,7 +339,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -398,7 +395,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 +434,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 +451,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 +465,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 +486,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 +506,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;
     }
 }
@@ -563,7 +560,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -614,7 +611,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -659,7 +656,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -693,7 +690,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -747,7 +744,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -778,7 +775,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 75af0b5f16d..be1c3e2f2ee 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -77,12 +77,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..a9ece93701b 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -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:
@@ -136,10 +133,7 @@ typedef class CORBA_Exception *CORBA_Exception_ptr;
   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(TRANSACTION_MODE);
 
 #define TAO_SYSTEM_EXCEPTION(name) \
   class CORBA_ ## name
@@ -148,62 +142,22 @@ TAO_SYSTEM_EXCEPTION_LIST
 
 #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 */
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 class CORBA_ORB;
 class CORBA_ORB_var;
@@ -215,6 +169,11 @@ class CORBA_Object_var;
 class CORBA_Object_out;
 typedef class CORBA_Object *CORBA_Object_ptr;
 
+class CORBA_Context;
+class CORBA_Context_var;
+class CORBA_Context_out;
+typedef class CORBA_Context *CORBA_Context_ptr;
+
 class CORBA_Current;
 class CORBA_Current_var;
 class CORBA_Current_out;
@@ -224,42 +183,17 @@ 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;
 
@@ -289,16 +223,6 @@ 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;
@@ -319,11 +243,6 @@ 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;
-
 // enum values defined in tao/NVList.h, bitwise ORed.
 typedef u_int CORBA_Flags;
 
@@ -338,6 +257,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
@@ -389,31 +311,31 @@ public:
   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 ACE_CDR::WChar WChar;
+  typedef WChar *WString;
+
   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 +343,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;
@@ -447,20 +367,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;
@@ -468,6 +374,11 @@ public:
   typedef CORBA_Object_var Object_var;
   typedef CORBA_Object_out Object_out;
 
+  typedef CORBA_Context Context;
+  typedef CORBA_Context *Context_ptr;
+  typedef CORBA_Context_var Context_var;
+  typedef CORBA_Context_out Context_out;
+
   typedef CORBA_Principal Principal;
   typedef CORBA_Principal *Principal_ptr;
 
@@ -486,33 +397,17 @@ 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_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 +420,7 @@ public:
     COMPLETED_MAYBE    // can't say what happened; retry unsafe
   };
 
-  enum exception_type
+  enum ExceptionType
   {
     // = Exception type.
 
@@ -534,8 +429,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,6 +440,7 @@ 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 (Context_ptr);
   static Boolean is_nil (TypeCode_ptr);
   static Boolean is_nil (ORB_ptr);
   static Boolean is_nil (Principal_ptr);
@@ -557,7 +451,6 @@ TAO_SYSTEM_EXCEPTION_LIST
   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 */
 
@@ -565,6 +458,7 @@ TAO_SYSTEM_EXCEPTION_LIST
   static void release (Object_ptr);
   static void release (Environment_ptr);
   static void release (Principal_ptr);
+  static void release (Context_ptr);
   static void release (TypeCode_ptr);
   static void release (ORB_ptr);
   static void release (ServerRequest_ptr req);
@@ -574,7 +468,6 @@ TAO_SYSTEM_EXCEPTION_LIST
   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 */
 
@@ -659,33 +552,16 @@ TAO_SYSTEM_EXCEPTION_LIST
 
   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
-  };
+    // = Define flags for NVList add methods
 
-  typedef char *ORBid;
-  typedef CORBA::String_var ORBid_var;
-  typedef CORBA::String_out ORBid_out;
-  static CORBA::TypeCode_ptr _tc_ORBid;
+    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;
@@ -730,38 +606,6 @@ TAO_SYSTEM_EXCEPTION_LIST
   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;
@@ -783,56 +627,6 @@ TAO_SYSTEM_EXCEPTION_LIST
   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;
@@ -904,8 +698,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..21f20823403 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -118,7 +118,7 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
       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,
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,
                             CORBA::TypeCode::TRAVERSE_STOP);
     }
 }
@@ -210,10 +210,6 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
 
   any->cdr_ = ACE_Message_Block::duplicate (out.begin ());
   any->value_ = 0;
-
-  if (any->type_)
-    CORBA::release (any->type_);
-
   any->type_ = elem_tc._retn ();
   any->any_owns_data_ = 1;
 
@@ -222,7 +218,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
       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));
     }
   return retval;
 }
@@ -313,7 +309,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 +389,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 +436,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,7 +514,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
         }
       else // bad kind_ value to be decoded
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
                         "TAO_Marshal_TypeCode:decode: "
@@ -539,7 +530,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -561,7 +552,7 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
   if ((*stream >> x) == 0)
     {
       *(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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 
@@ -585,7 +576,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
   if ((*stream >> object) == 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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 
@@ -732,7 +723,7 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -837,11 +828,11 @@ 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)
+                                    (void)stream.decode (discrim_tc, &l, 0, env);
+                                    if (l == *(CORBA::Long *) discrim_val)
                                       discrim_matched = 1;
                                   }
                                   break;
@@ -854,9 +845,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 +858,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 +874,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 +894,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;
     }
 }
@@ -997,7 +960,7 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1218,7 +1181,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;
 }
 
@@ -1369,7 +1332,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -1466,7 +1429,7 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1596,7 +1559,7 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1643,7 +1606,7 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index 6d647935f40..aac4e387cf2 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -115,7 +115,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 *,
@@ -129,7 +129,7 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  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);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   my_kind = tc->kind (env);
@@ -158,7 +158,7 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  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);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -175,7 +175,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  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);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -274,7 +274,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
       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);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -290,41 +290,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);
 
-  member_val = base_union->_access (0);
-  // Get a pointer to the member, but don't allocate new storage.
+  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
+
+  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 +342,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 +350,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 +394,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;
 }
@@ -491,7 +452,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  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);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   bounds = tc->length (env);
@@ -638,7 +599,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Sequence::deep_free detected error\n"));
       // 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);
 }
@@ -659,7 +620,7 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  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);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   // get element type
@@ -740,7 +701,7 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
       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);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP);
 }
@@ -766,7 +727,7 @@ TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  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);
+      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..d8062f7fc03 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,72 +99,16 @@ 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;
-}
-
-// ****************************************************************
-
 ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
 		       ASYS_TEXT ("Client_Strategy_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 2aba0ea5b81..54c2c1ddfc6 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_;
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..9073b72189e 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -45,17 +45,28 @@ 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;
 }
 
 ACE_Lock *
@@ -162,8 +173,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)
@@ -303,8 +316,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
 
             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;
+            else if (ACE_OS::strcasecmp (name, "user") == 0)
+              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_USER_DEFINED;
           }
       }
     else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 46fddd5e65b..66d41a508b6 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,11 @@ public:
 
   virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
 
-  virtual int enable_poa_locking (void);
-  // Enable POA locking?
+  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_servant_lock (void);
   // Creates and returns a lock for servants based on the setting of
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index ac3a0892cd3..86471b76112 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -99,7 +99,7 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -149,7 +149,7 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -219,7 +219,7 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -238,7 +238,7 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
 
   if ((*stream << p) == 0)
     {
-      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;
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -265,7 +265,7 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
 
   if ((*stream << obj) == 0)
     {
-      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;
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -400,7 +400,7 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -506,12 +506,12 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
 
         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, ACE_TRY_ENV);
+            (void)stream.decode (discrim_tc, &l, 0, ACE_TRY_ENV);
             ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            if (ul == *(CORBA::ULong *) discrim_val)
+            if (l == *(CORBA::Long *) discrim_val)
               discrim_matched = 1;
           }
           break;
@@ -526,9 +526,8 @@ TAO_Marshal_Union::encode (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;
 
@@ -546,7 +545,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
             ACE_DEBUG ((LM_DEBUG,
                         "Union::encode - "
                         "Bad discriminant type\n"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE),
                             CORBA::TypeCode::TRAVERSE_STOP);
         }// end of switch
 
@@ -565,50 +564,23 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
         {
           member_val = base_union->_access (0);
           // 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->encode (member_tc, &ptr, data2, ACE_TRY_ENV);
-            }
-          else
-            {
-              return stream->encode (member_tc, member_val,
-                                     data2, ACE_TRY_ENV);
-            }
+          return stream->encode (member_tc, member_val,
+                                 data2, ACE_TRY_ENV);
         }
     }
   // 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
-        {
-          return stream->encode (default_tc, member_val,
-                                 data2, ACE_TRY_ENV);
-        }
+      return stream->encode (default_tc, member_val, data2,
+                             ACE_TRY_ENV);
     }
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Union::encode - failed. "
                 "No match and no default case\n"));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
+  ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO),
                     CORBA::TypeCode::TRAVERSE_STOP);
 }
 
@@ -849,7 +821,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;
 }
 
@@ -999,7 +971,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -1083,7 +1055,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1205,7 +1177,7 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
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..282146552be 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -242,34 +242,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.
@@ -284,17 +256,11 @@
 // 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 */
+// #define TAO_HAS_CORBA_MESSAGING
 
 // The maximum value for an standard PolicyType, we use this trick to
 // pack the standard policies and the TAO extension in a single
@@ -315,6 +281,6 @@
 // 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)
+#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..3614de4fd22 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -26,3 +26,5 @@ 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..61b30ffa892 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -122,16 +122,16 @@ public:
   // 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);
+  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
+  // 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
@@ -164,13 +164,13 @@ private:
 
   int sock_rcvbuf_size_;
   // Size to be used for a socket's receive buffer.
-
+  
   int sock_sndbuf_size_;
   // Size to be used for a socket's send buffer.
 
   int cdr_default_size_;
   // Default size for CDR buffers.
-
+  
   int cdr_max_exp_size_;
   // Cutoff value for exponential growth of CDR buffers.
 
@@ -196,6 +196,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..79619f37ba0 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
 {
@@ -159,7 +199,7 @@ TAO_ORB_Parameters::trading_service_port (void) const
 }
 
 ACE_INLINE TAO_IOR_LookupTable *
-TAO_ORB_Parameters::ior_lookup_table (void)
+TAO_ORB_Parameters::ior_lookup_table (void) 
 {
   return this->ior_lookup_table_;
 }
@@ -181,3 +221,4 @@ TAO_ORB_Parameters::default_init_ref (void) const
 {
   return this->default_init_ref_.rep ();
 }
+
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index b6dca5d281c..4a4c60d09c4 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -85,7 +85,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -117,7 +117,6 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
       else
         retval = CORBA::TypeCode::TRAVERSE_STOP;
     }
-  CORBA::release (elem_tc);
   return retval;
 }
 
@@ -202,7 +201,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
             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));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -214,7 +213,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -247,7 +246,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -333,7 +332,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
             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));
             return CORBA::TypeCode::TRAVERSE_STOP;
           }
 
@@ -341,7 +340,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;
           }
       }
@@ -354,7 +353,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -396,7 +395,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -433,149 +432,149 @@ 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:
-                                {
-                                  CORBA::ULong l;
-                                  *member_label >>= l;
-                                  if (l == *(CORBA::ULong *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_enum:
+                              // do the matching
+			                        CORBA::TypeCode_var type = member_label->type ();
+                              switch (type->kind (env))
                                 {
-                                  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)
+                                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 (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_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;
+                                  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;
-                              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:
+                              else
                                 {
-                                  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 ());
-                                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)
-                                {
-                                  // 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;
     }
 }
@@ -607,7 +606,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -657,7 +656,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -696,7 +695,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
   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));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -731,7 +730,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -784,7 +783,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -822,7 +821,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
       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));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 56d267910af..cc63dedb56e 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.
 
@@ -136,71 +139,41 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -211,10 +184,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,11 +222,8 @@ 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 \
@@ -246,7 +242,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -311,24 +306,20 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -338,14 +329,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -413,71 +397,41 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -488,10 +442,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,11 +480,8 @@ 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 \
@@ -523,7 +500,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -588,24 +564,20 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -615,14 +587,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -694,71 +659,41 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -769,10 +704,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,11 +742,8 @@ 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 \
@@ -804,7 +762,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -869,24 +826,20 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -896,14 +849,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -971,71 +917,41 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1046,10 +962,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,11 +1000,8 @@ 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 \
@@ -1081,7 +1020,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1146,24 +1084,20 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1173,14 +1107,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1252,71 +1179,41 @@ 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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1327,10 +1224,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,11 +1262,8 @@ 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 \
@@ -1362,7 +1282,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1427,24 +1346,20 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1454,13 +1369,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 6f7ff86f6f2..361eaae7391 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/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/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/Makefile b/TAO/tests/InterOp-Naming/Makefile
index a3cf6276b87..4fdaf57b17c 100644
--- a/TAO/tests/InterOp-Naming/Makefile
+++ b/TAO/tests/InterOp-Naming/Makefile
@@ -5,37 +5,33 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO
+LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = \
-        InterOp_test.cpp \
+	InterOp_test.cpp \
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                InterOp_test.o \
-                ../../../examples/Simple/bank/.obj/BankC.o \
-                ../../../examples/Simple/bank/.obj/BankS.o
+		InterOp_test.o \
+		../../../examples/Simple/bank/.obj/BankC.o \
+		../../../examples/Simple/bank/.obj/BankS.o	
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-BIN2 = InterOp_test
+BIN = 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
+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 +43,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -55,12 +51,10 @@ LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/examples/Simple/bank
 
-InterOp_test: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+InterOp_test:	$(addprefix $(VDIR),$(SIMPLE_CLT_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.
diff --git a/TAO/tests/MT_Client/MT_Client.dsw b/TAO/tests/MT_Client/MT_Client.dsw
index 6cab0b649dd..d17cf7c9604 100644
--- a/TAO/tests/MT_Client/MT_Client.dsw
+++ b/TAO/tests/MT_Client/MT_Client.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Multithreaded Client"=.\client.dsp - Package Owner=<4>

+Project: "client"=.\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,19 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Multithreaded Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ORB Creation"=.\orb_creation.dsp - Package Owner=<4>

+Project: "server"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index 354c6cc5427..75a1e22ecc1 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -15,12 +15,11 @@ endif # ! TAO_ROOT
 LDLIBS = -lTAO
 
 IDLFILES = testC testS
-BIN = client server orb_creation
+BIN = client server
 
 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)
@@ -53,11 +52,8 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 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.*
+	-/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.
@@ -190,45 +186,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -239,9 +231,9 @@ realclean: clean
  $(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 \
@@ -251,11 +243,8 @@ 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 \
@@ -274,7 +263,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -307,24 +295,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -335,13 +319,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -413,71 +390,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -488,10 +435,36 @@ realclean: clean
  $(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,11 +473,8 @@ 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 \
@@ -523,7 +493,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -588,24 +557,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -616,17 +581,9 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
+.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 \
@@ -636,23 +593,19 @@ 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 \
- $(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 \
+ $(TAO_ROOT)/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 \
@@ -660,17 +613,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/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 \
@@ -678,6 +627,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 \
@@ -687,110 +641,49 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -801,184 +694,10 @@ realclean: clean
  $(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/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 \
@@ -1005,52 +724,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 \
@@ -1059,11 +732,8 @@ 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 \
@@ -1082,7 +752,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1147,24 +816,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1175,13 +840,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1250,71 +908,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1325,10 +953,36 @@ realclean: clean
  $(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 \
@@ -1337,11 +991,8 @@ 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 \
@@ -1360,7 +1011,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1425,24 +1075,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1453,13 +1099,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1528,71 +1167,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1603,10 +1212,36 @@ realclean: clean
  $(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 \
@@ -1615,11 +1250,8 @@ 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 \
@@ -1638,7 +1270,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1703,24 +1334,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1731,13 +1358,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/client.cpp b/TAO/tests/MT_Client/client.cpp
index d47a445d22c..0b69366f2f8 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -4,7 +4,7 @@
 #include "ace/Task.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Client, client, "$Id$")
+ACE_RCSID(MT_Client, server, "$Id$")
 
 const char *ior = "file://test.ior";
 int nthreads = 5;
@@ -110,8 +110,7 @@ main (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+      ACE_TRY_ENV.print_exception ("Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/MT_Client/client.global.conf b/TAO/tests/MT_Client/client.global.conf
index 4883a8b375b..118895c1fe6 100644
--- a/TAO/tests/MT_Client/client.global.conf
+++ b/TAO/tests/MT_Client/client.global.conf
@@ -1,3 +1,3 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
diff --git a/TAO/tests/MT_Client/client.tss.conf b/TAO/tests/MT_Client/client.tss.conf
index d1a2308e80f..45ff5ad1baf 100644
--- a/TAO/tests/MT_Client/client.tss.conf
+++ b/TAO/tests/MT_Client/client.tss.conf
@@ -1,3 +1,3 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources tss"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_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
index 659f8671712..8bf6f24a29a 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -1,40 +1,34 @@
+#$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;
 
 $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");
+		       " -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");
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT "
+		   . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level"
+		   . " -k file://$iorfile "
+		   . " -n 10 -i 1000");
 
 $SV->Kill (); $SV->Wait ();
 
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index f3d32eea712..1eb98ddeca8 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
 	{
 	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
 	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
+	    ACE_ERROR_RETURN ((LM_DEBUG,
 			       "Cannot open output file for writing IOR: %s",
 			       ior_output_file),
 			      1);
@@ -93,8 +93,7 @@ main (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+      ACE_TRY_ENV.print_exception ("Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
index 83ba817c7d2..e90cd71a29f 100644
--- a/TAO/tests/Makefile
+++ b/TAO/tests/Makefile
@@ -15,8 +15,7 @@ DIRS  = CDR \
         Param_Test \
         NestedUpcall \
         Multiple_Inheritance \
-	MT_Client \
-	FL_Cube
+	MT_Client
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index a23748954c7..249b73fc67d 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,7 +50,7 @@ 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.
@@ -123,71 +123,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -198,10 +168,36 @@ realclean: clean
  $(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 \
@@ -210,11 +206,8 @@ 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 \
@@ -233,7 +226,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -298,24 +290,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -326,13 +314,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -404,71 +385,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -479,10 +430,36 @@ realclean: clean
  $(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 \
@@ -491,11 +468,8 @@ 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 \
@@ -514,7 +488,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -579,24 +552,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -607,13 +576,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -688,71 +650,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -763,10 +695,36 @@ realclean: clean
  $(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 \
@@ -775,11 +733,8 @@ 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 \
@@ -798,7 +753,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -863,24 +817,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -891,13 +841,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -974,71 +917,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1049,10 +962,36 @@ realclean: clean
  $(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 \
@@ -1061,11 +1000,8 @@ 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 \
@@ -1084,7 +1020,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1149,24 +1084,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1177,13 +1108,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
 # 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
index 0d266622919..7c2dde7858a 100644
--- a/TAO/tests/Multiple_Profiles/Makefile
+++ b/TAO/tests/Multiple_Profiles/Makefile
@@ -41,6 +41,9 @@ include $(TAO_ROOT)/taoconfig.mk
 forward:	$(addprefix $(VDIR),$(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.
 
diff --git a/TAO/tests/Multiple_Profiles/forward.cpp b/TAO/tests/Multiple_Profiles/forward.cpp
index 846532a1727..4fdfeeddf3e 100644
--- a/TAO/tests/Multiple_Profiles/forward.cpp
+++ b/TAO/tests/Multiple_Profiles/forward.cpp
@@ -178,8 +178,8 @@ roundtrip_continue_label:
     // 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)
+    // CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE)
+    // CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE)
     int result = myinvoke (); // this is call.invoke (...)
 
     if (result == 0)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index 26b1089cddd..2c0bd65607a 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,11 +61,7 @@ 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.
@@ -134,71 +133,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -209,10 +178,36 @@ realclean: clean
  $(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 \
@@ -221,11 +216,8 @@ 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 \
@@ -244,7 +236,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -309,24 +300,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -337,13 +324,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -414,71 +394,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -489,10 +439,36 @@ realclean: clean
  $(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 \
@@ -501,11 +477,8 @@ 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 \
@@ -524,7 +497,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -589,24 +561,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -617,13 +585,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
@@ -695,32 +656,59 @@ 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 \
+ MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -747,48 +735,14 @@ 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 \
- 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 \
@@ -807,7 +761,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -872,24 +825,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -900,13 +849,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
@@ -1039,45 +981,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1088,9 +1026,9 @@ realclean: clean
  $(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,11 +1038,8 @@ 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 \
@@ -1123,7 +1058,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_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 \
@@ -1156,24 +1090,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1184,13 +1114,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1267,32 +1190,59 @@ 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 \
+ MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1319,48 +1269,14 @@ 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 \
- 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 \
@@ -1379,7 +1295,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1444,24 +1359,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1472,13 +1383,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 .obj/MT_Object_i.o .obj/MT_Object_i.so .shobj/MT_Object_i.o .shobj/MT_Object_i.so: MT_Object_i.cpp \
@@ -1548,71 +1452,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1623,10 +1497,36 @@ realclean: clean
  $(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,11 +1535,8 @@ 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 \
@@ -1658,7 +1555,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1723,24 +1619,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1751,13 +1643,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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..dea07299cd2 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"
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/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
index 80539a0ff3e..9f20e8dab6c 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,27 +41,24 @@ 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.
@@ -139,71 +130,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -214,10 +175,36 @@ realclean: clean
  $(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,11 +213,8 @@ 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 \
@@ -249,7 +233,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -314,24 +297,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -342,13 +321,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -418,71 +390,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -493,10 +435,36 @@ realclean: clean
  $(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 \
@@ -505,11 +473,8 @@ 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 \
@@ -528,7 +493,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -593,24 +557,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -621,13 +581,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -709,71 +662,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -784,10 +707,36 @@ realclean: clean
  $(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 \
@@ -796,11 +745,8 @@ 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 \
@@ -819,7 +765,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -883,24 +828,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -911,13 +852,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -994,71 +928,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1069,10 +973,36 @@ realclean: clean
  $(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 \
@@ -1081,11 +1011,8 @@ 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 \
@@ -1104,7 +1031,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1169,24 +1095,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1197,13 +1119,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1273,71 +1188,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1348,10 +1233,36 @@ realclean: clean
  $(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 \
@@ -1360,11 +1271,8 @@ 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 \
@@ -1383,7 +1291,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1448,24 +1355,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1476,13 +1379,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1554,32 +1450,59 @@ 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/CosNamingC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1606,48 +1529,14 @@ 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/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 \
@@ -1666,7 +1555,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1731,24 +1619,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1759,13 +1643,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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,6 +1653,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
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/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 83e7a0db999..882557f28b5 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,11 +68,7 @@ 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.
@@ -143,71 +140,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -218,10 +185,36 @@ realclean: clean
  $(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,11 +223,8 @@ 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 \
@@ -253,7 +243,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -318,24 +307,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -346,13 +331,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -422,71 +400,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -497,10 +445,36 @@ realclean: clean
  $(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 \
@@ -509,11 +483,8 @@ 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 \
@@ -532,7 +503,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -597,24 +567,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -625,13 +591,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -703,32 +662,59 @@ 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 \
+ Object_A_i.h Triangle_TestS.h Triangle_TestC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -755,48 +741,14 @@ 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_A_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 \
@@ -815,7 +767,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -880,24 +831,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -908,13 +855,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -986,32 +926,59 @@ 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 \
+ Object_B_i.h Triangle_TestS.h Triangle_TestC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1038,48 +1005,14 @@ 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/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map.i \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -1098,7 +1031,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1163,24 +1095,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1191,13 +1119,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1267,71 +1188,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1342,10 +1233,36 @@ realclean: clean
  $(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 \
@@ -1354,11 +1271,8 @@ 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 \
@@ -1377,7 +1291,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1442,24 +1355,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1470,13 +1379,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1547,71 +1449,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1622,10 +1494,36 @@ realclean: clean
  $(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 \
@@ -1634,11 +1532,8 @@ 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 \
@@ -1657,7 +1552,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1722,24 +1616,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1750,13 +1640,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -1827,71 +1710,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1902,10 +1755,36 @@ realclean: clean
  $(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,11 +1793,8 @@ 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 \
@@ -1937,7 +1813,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2002,24 +1877,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2030,13 +1901,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
@@ -2112,32 +1976,59 @@ 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 \
+ Initiator_i.h Triangle_TestS.h Triangle_TestC.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/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/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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2164,48 +2055,14 @@ 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 \
- 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 \
@@ -2224,7 +2081,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2289,24 +2145,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2317,13 +2169,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
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/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index 81c9aca5d09..873a017b6ca 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.
@@ -126,71 +129,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -201,10 +174,36 @@ realclean: clean
  $(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,11 +212,8 @@ 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 \
@@ -236,7 +232,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -301,24 +296,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -329,13 +320,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -404,71 +388,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -479,10 +433,36 @@ realclean: clean
  $(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 \
@@ -491,11 +471,8 @@ 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 \
@@ -514,7 +491,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -579,24 +555,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -607,13 +579,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -682,71 +647,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -757,10 +692,36 @@ realclean: clean
  $(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 \
@@ -769,11 +730,8 @@ 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 \
@@ -792,7 +750,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -857,24 +814,20 @@ realclean: clean
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -885,13 +838,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index f01e6d8060c..62a9fe8620e 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -57,8 +57,7 @@ CLI_FILES =	param_testCli	\
 		var_struct \
 		except \
 		big_union \
-		multdim_array \
-		complex_any
+		multdim_array
 
 PARAM_TEST_SVR_OBJS = $(addsuffix .o,$(SVR_FILES))
 PARAM_TEST_CLT_OBJS = $(addsuffix .o,$(CLI_FILES))
@@ -94,7 +93,7 @@ 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
+			 -ss Ser.cpp -sT Ser_T.cpp  
 
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
@@ -107,8 +106,11 @@ 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
 
@@ -182,71 +184,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -257,10 +229,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -269,11 +267,8 @@ 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 \
@@ -292,7 +287,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -357,24 +351,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -385,15 +375,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -461,71 +444,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -536,10 +489,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -548,11 +527,8 @@ 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 \
@@ -571,7 +547,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -636,24 +611,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -664,15 +635,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 \
@@ -743,71 +707,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -818,10 +752,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -830,11 +790,8 @@ 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 \
@@ -853,7 +810,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -918,24 +874,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -946,15 +898,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 \
@@ -1022,71 +967,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1097,10 +1012,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1109,11 +1050,8 @@ 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 \
@@ -1132,7 +1070,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1197,24 +1134,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1225,15 +1158,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1301,71 +1228,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1376,10 +1273,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1388,11 +1311,8 @@ 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 \
@@ -1411,7 +1331,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1476,24 +1395,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1504,13 +1419,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -1579,71 +1487,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1654,10 +1532,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1666,11 +1570,8 @@ 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 \
@@ -1689,7 +1590,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -1754,24 +1654,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -1782,15 +1678,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1858,71 +1747,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1933,10 +1792,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1945,11 +1830,8 @@ 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 \
@@ -1968,7 +1850,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2033,24 +1914,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2061,15 +1938,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
+ 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 driver.h options.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -2140,71 +2010,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2212,10 +2052,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.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/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 \
@@ -2224,11 +2090,8 @@ 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 \
@@ -2247,7 +2110,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2312,24 +2174,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2340,13 +2198,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2430,71 +2281,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2502,10 +2323,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.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/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 \
@@ -2514,11 +2361,8 @@ 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 \
@@ -2537,7 +2381,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2602,24 +2445,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2630,13 +2469,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -2718,71 +2550,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2790,10 +2592,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.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/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 \
@@ -2802,11 +2630,8 @@ 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 \
@@ -2825,7 +2650,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -2890,24 +2714,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -2917,14 +2737,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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/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 \
@@ -2993,71 +2806,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3068,10 +2851,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3080,11 +2889,8 @@ 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 \
@@ -3103,7 +2909,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3168,24 +2973,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3196,13 +2997,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3274,71 +3068,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3349,10 +3113,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3361,11 +3151,8 @@ 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 \
@@ -3384,7 +3171,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3449,24 +3235,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3477,13 +3259,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3552,71 +3327,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3627,10 +3372,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3639,11 +3410,8 @@ 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 \
@@ -3662,7 +3430,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -3727,24 +3494,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -3755,13 +3518,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -3830,71 +3586,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3905,10 +3631,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3917,11 +3669,8 @@ 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 \
@@ -3940,7 +3689,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4005,24 +3753,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4033,13 +3777,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4108,71 +3845,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4183,10 +3890,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4195,11 +3928,8 @@ 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 \
@@ -4218,7 +3948,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4283,24 +4012,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4311,13 +4036,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4386,71 +4104,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4461,10 +4149,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4473,11 +4187,8 @@ 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 \
@@ -4496,7 +4207,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4561,24 +4271,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4589,13 +4295,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4664,71 +4363,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4739,10 +4408,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4751,11 +4446,8 @@ 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 \
@@ -4774,7 +4466,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -4839,24 +4530,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -4867,13 +4554,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -4942,71 +4622,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5017,10 +4667,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5029,11 +4705,8 @@ 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 \
@@ -5052,7 +4725,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -5117,24 +4789,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5145,13 +4813,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -5220,71 +4881,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5295,10 +4926,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5307,11 +4964,8 @@ 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 \
@@ -5330,7 +4984,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -5395,24 +5048,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5423,13 +5072,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -5498,71 +5140,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5573,10 +5185,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5585,11 +5223,8 @@ 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 \
@@ -5608,7 +5243,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -5673,24 +5307,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5701,13 +5331,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -5776,71 +5399,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5851,10 +5444,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5863,11 +5482,8 @@ 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 \
@@ -5886,7 +5502,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -5951,24 +5566,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -5979,13 +5590,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -6054,71 +5658,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6129,10 +5703,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6141,11 +5741,8 @@ 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 \
@@ -6164,7 +5761,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -6229,24 +5825,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6257,13 +5849,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -6332,71 +5917,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6407,10 +5962,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6419,11 +6000,8 @@ 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 \
@@ -6442,7 +6020,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -6507,24 +6084,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6535,13 +6108,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -6610,71 +6176,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6685,10 +6221,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6697,11 +6259,8 @@ 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 \
@@ -6720,7 +6279,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -6785,24 +6343,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -6813,13 +6367,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -6888,71 +6435,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6963,10 +6480,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6975,11 +6518,8 @@ 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 \
@@ -6998,7 +6538,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -7063,24 +6602,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7091,13 +6626,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -7166,71 +6694,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7241,10 +6739,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7253,11 +6777,8 @@ 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 \
@@ -7276,7 +6797,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -7341,24 +6861,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7369,13 +6885,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -7444,71 +6953,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7519,10 +6998,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7531,11 +7036,8 @@ 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 \
@@ -7554,7 +7056,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -7619,24 +7120,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7647,13 +7144,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -7722,71 +7212,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7797,10 +7257,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7809,11 +7295,8 @@ 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 \
@@ -7832,7 +7315,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -7897,24 +7379,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -7925,13 +7403,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -8000,71 +7471,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8075,10 +7516,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8087,11 +7554,8 @@ 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 \
@@ -8110,7 +7574,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -8175,24 +7638,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8203,13 +7662,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -8278,71 +7730,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8353,10 +7775,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8365,11 +7813,8 @@ 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 \
@@ -8388,7 +7833,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -8453,24 +7897,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8481,13 +7921,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -8556,71 +7989,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8631,10 +8034,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8643,11 +8072,8 @@ 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 \
@@ -8666,7 +8092,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -8731,24 +8156,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -8759,13 +8180,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -8834,71 +8248,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8909,10 +8293,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8921,11 +8331,8 @@ 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 \
@@ -8944,7 +8351,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -9009,24 +8415,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9037,13 +8439,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -9112,71 +8507,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9187,10 +8552,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9199,11 +8590,8 @@ 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 \
@@ -9222,7 +8610,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -9287,24 +8674,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9315,13 +8698,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -9390,71 +8766,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9465,10 +8811,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9477,11 +8849,8 @@ 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 \
@@ -9500,7 +8869,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -9565,24 +8933,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9593,13 +8957,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -9668,71 +9025,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9743,10 +9070,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9755,11 +9108,8 @@ 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 \
@@ -9778,7 +9128,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -9843,24 +9192,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -9871,13 +9216,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -9946,71 +9284,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10021,10 +9329,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -10033,11 +9367,8 @@ 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 \
@@ -10056,7 +9387,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -10121,24 +9451,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10149,13 +9475,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -10224,71 +9543,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10299,10 +9588,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -10311,11 +9626,8 @@ 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 \
@@ -10334,7 +9646,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -10399,24 +9710,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10427,13 +9734,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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 \
@@ -10502,71 +9802,41 @@ 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/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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10577,10 +9847,36 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -10589,11 +9885,8 @@ 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 \
@@ -10612,7 +9905,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -10677,24 +9969,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -10705,14 +9993,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 600113401c2..537c6c89e4a 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -108,8 +108,8 @@ Test_Any::reset_parameters (void)
                       "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;
       }
@@ -121,11 +121,10 @@ Test_Any::reset_parameters (void)
           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;
 
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 52bb0afc62b..242046955c5 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -278,11 +278,7 @@ Test_Big_Union::check_validity (void)
             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;
-              }
+              return 0;
           }
       }
       break;
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp
index 1968f782f6a..0785393dc85 100644
--- a/TAO/tests/Param_Test/client.dsp
+++ b/TAO/tests/Param_Test/client.dsp
@@ -119,10 +119,6 @@ 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

@@ -259,10 +255,6 @@ 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..d0ccfa3c131 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -470,19 +470,6 @@ Driver::run (void)
         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:
       {
@@ -549,7 +536,6 @@ 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
@@ -582,7 +568,6 @@ template class Param_Test_Client<Test_Multdim_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
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 2dde40d092a..2ad848bd04d 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"))
 {
 }
 
@@ -64,10 +63,10 @@ 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;
-
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      
       // Why should we use clear ?????
       //TAO_TRY_ENV.clear ();
 
@@ -80,10 +79,10 @@ Test_Exception::dii_req_invoke (CORBA::Request *req,
           ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - "
                                "expected system exception\n");
         }
-      this->inout_ = this->in_ * 4;
-      this->out_ = this->in_ * 5;
-      this->ret_ = this->in_ * 6;
-
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      
       // TAO_TRY_ENV.clear ();
 
       return;
@@ -142,9 +141,9 @@ 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;
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
       return -1;
     }
   ACE_CATCH (CORBA::UNKNOWN, ex)
@@ -153,9 +152,9 @@ Test_Exception::run_sii_test (Param_Test_ptr objref,
         {
           ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - expected system exception\n");
         }
-      this->inout_ = this->in_ * 4;
-      this->out_ = this->in_ * 5;
-      this->ret_ = this->in_ * 6;
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
       return -1;
     }
   ACE_CATCH (Param_Test::BadBoy, ex)
@@ -215,10 +214,9 @@ Test_Exception::add_args (CORBA::NVList_ptr param_list,
 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..bb5f21e4ef9 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -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/options.cpp b/TAO/tests/Param_Test/options.cpp
index c548bfeda8a..021832240ff 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
@@ -139,8 +139,6 @@ Options::parse_args (int argc, char **argv)
           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;
 
       case '?':
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index b64ab9ece9a..c106078e26c 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -59,8 +59,7 @@ public:
     TEST_VAR_ARRAY,
     TEST_MULTDIM_ARRAY,
     TEST_EXCEPTION,
-    TEST_BIG_UNION,
-    TEST_COMPLEX_ANY
+    TEST_BIG_UNION
   };
 
   enum INVOKE_TYPE
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
index 4ec36807208..de8c4cae069 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.
 //
@@ -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,
@@ -266,28 +266,6 @@ interface Param_Test
                             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);
-
   // 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
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index c5cbbd3ec4a..c09be8d9b98 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -686,7 +686,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
     {
       Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret;
       a1 >>= bu_in;
-
+      
       // Insert copies....
       a2 <<= *bu_in;
       *a3 <<= *bu_in;
@@ -761,8 +761,13 @@ 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);
+    {
+      ACE_TRY_ENV.exception (new Param_Test::Ooops (CORBA::string_dup (" % 3 == 1"),
+					    s1));
+      return 0;
+    }
+  ACE_TRY_ENV.exception (new Param_Test::BadBoy);
+  return 0;
 }
 
 Param_Test::Big_Union*
@@ -777,25 +782,13 @@ Param_Test_i::test_big_union (const 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);
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8c7b1c80371..ab8c89250f7 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -234,12 +234,6 @@ public:
                     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 *
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 26a8d65f916..4aaf42d658e 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_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;
 require Process;
@@ -24,7 +23,7 @@ sub run_test
   $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                          "$debug -ORBport $port -o ".
                          $iorfile);
-
+  
   ACE::waitforfile ($iorfile);
 
   system ($EXEPREFIX."client $debug -f $iorfile  -i $invocation -t ".
@@ -104,7 +103,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
           "ub_short_sequence", "ub_long_sequence",
           "bd_short_sequence", "bd_long_sequence",
           "fixed_array", "var_array", "typecode", "exception",
-	  "big_union", "complex_any");
+	  "big_union");
 
 if ($type ne "")
 {
diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h
index 9cd2b1b1dc6..1b94e3871d4 100644
--- a/TAO/tests/Param_Test/tests.h
+++ b/TAO/tests/Param_Test/tests.h
@@ -44,7 +44,6 @@
 #include "var_struct.h"
 #include "except.h"
 #include "big_union.h"
-#include "complex_any.h"
 #if 0
 #include "multdim_array.h"
 #endif
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index b71f846c94e..26e160ef039 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$")
 
@@ -67,17 +66,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,17 +83,15 @@ 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" ));
+	    if (TAO_debug_level > 0)
+	      ACE_DEBUG ((LM_DEBUG, "setting coffee object \n" ));
             ACE_TRY
               {
                 // get access to a Coffee Object
@@ -109,8 +104,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref,
               }
             ACE_CATCH (CORBA::SystemException, sysex)
               {
-                ACE_PRINT_EXCEPTION (sysex,
-                                     "System Exception doing make_coffee");
+                ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
                 return -1;
               }
             ACE_ENDTRY;
@@ -118,10 +112,13 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref,
           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 +133,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 +158,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;
         }
     }
@@ -181,7 +181,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref,
                                     this->inout_.inout (),
                                     out,
                                     ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1 : 0);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -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/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..72af318d044 100644
--- a/TAO/utils/IOR-parser/Makefile
+++ b/TAO/utils/IOR-parser/Makefile
@@ -55,5 +55,22 @@ 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
+.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/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_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/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 4ae1d4e7ce2..89b16196f74 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -113,71 +113,41 @@ 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/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.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/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -188,10 +158,36 @@ include $(TAO_ROOT)/taoconfig.mk
  $(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,11 +196,8 @@ 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 \
@@ -223,7 +216,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
@@ -288,24 +280,20 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_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 \
@@ -316,13 +304,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_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
 
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index f4445db7a82..865041a2792 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;
     }
@@ -401,7 +401,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;
     }
 
@@ -545,7 +545,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 +595,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..4430737cbb4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 4.6.40, released Sat May 22 16:36:14 1999.
+This is ACE version 4.6.36, released Mon Apr 12 00:18:23 1999.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/acconfig.h b/acconfig.h
index 51d5b84cc84..68bdb1ad067 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -503,9 +503,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 +639,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
 
@@ -1085,9 +1085,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 +1106,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 +1115,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
 
@@ -1224,9 +1218,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 +1236,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
 
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 5b96172d8e6..4b1f9cb1dc5 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -6,7 +6,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/INET_Addr.h"
 #include "ace/Object_Manager.h"
-#include "ace/SString.h"
 #include "ace/Version.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
@@ -15,9 +14,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 +26,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::instance()->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::instance()->fini ();
 }
 
 u_int
@@ -1077,6 +1053,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 +1104,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 +1187,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 +1231,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 +1240,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 +1295,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 +1307,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 +1714,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 +1732,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 +1763,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 +1842,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)
@@ -2157,7 +2146,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 +2182,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:
diff --git a/ace/ACE.h b/ace/ACE.h
index ef2f03b2deb..080428bf1cc 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.
 
@@ -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..5b006529771 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
diff --git a/ace/ARGV.i b/ace/ARGV.i
index b14d0963274..3619a4e742c 100644
--- a/ace/ARGV.i
+++ b/ace/ARGV.i
@@ -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
index dcf40446f37..530329df8a0 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -15,60 +15,54 @@ 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;
+const int ACE_ATM_Addr::SELECTOR = 0x99;
 #endif /* ACE_HAS_FORE_ATM_XTI */
 
 // Default constructor
 
-ACE_ATM_Addr::ACE_ATM_Addr (unsigned char selector)
+ACE_ATM_Addr::ACE_ATM_Addr (void)
 #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);
+  this->init ();
 }
 
 // Copy constructor.
 
-ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap,
-                            unsigned char selector)
+ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap)
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
+  this->set (sap);
 }
 
-ACE_ATM_Addr::ACE_ATM_Addr (const ATMSAPAddress *sap,
-                            unsigned char selector)
+ACE_ATM_Addr::ACE_ATM_Addr (const ATMSAPAddress *sap)
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
+  this->set (sap);
 }
 
-ACE_ATM_Addr::ACE_ATM_Addr (const ASYS_TCHAR sap[],
-                            unsigned char selector)
+ACE_ATM_Addr::ACE_ATM_Addr (const ASYS_TCHAR sap[])
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
+  this->set (sap);
 }
 
 void
-ACE_ATM_Addr::init (unsigned char selector)
+ACE_ATM_Addr::init (void)
 {
 #if defined (ACE_HAS_FORE_ATM_XTI)
   // Note: this approach may be FORE implementation-specific.  When we
@@ -84,7 +78,7 @@ ACE_ATM_Addr::init (unsigned char selector)
 
   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_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;
@@ -96,17 +90,15 @@ ACE_ATM_Addr::init (unsigned char selector)
                   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_ATM_Addr::set (const ACE_ATM_Addr &sap)
 {
   ACE_TRACE ("ACE_ATM_Addr::set");
 
-  this->init (selector);
+  this->init ();
 
   this->ACE_Addr::base_set (sap.get_type (),
                             sap.get_size ());
@@ -122,12 +114,11 @@ ACE_ATM_Addr::set (const ACE_ATM_Addr &sap,
 }
 
 int
-ACE_ATM_Addr::set (const ATMSAPAddress *sap,
-                   unsigned char selector)
+ACE_ATM_Addr::set (const ATMSAPAddress *sap)
 {
   ACE_TRACE ("ACE_ATM_Addr::set");
 
-  this->init (selector);
+  this->init ();
 
 #if defined (ACE_HAS_FORE_ATM_XTI)
   this->ACE_Addr::base_set (AF_ATM,
@@ -143,12 +134,11 @@ ACE_ATM_Addr::set (const ATMSAPAddress *sap,
 }
 
 int
-ACE_ATM_Addr::set (const ASYS_TCHAR address[],
-                   unsigned char selector)
+ACE_ATM_Addr::set (const ASYS_TCHAR address[])
 {
   ACE_TRACE ("ACE_ATM_Addr::set");
 
-  this->init (selector);
+  this->init ();
 
 #if defined (ACE_HAS_FORE_ATM_XTI)
   atm_addr_.sap.t_atm_sap_addr.SVE_tag_addr =
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index 2f644c3bb95..076fbff550a 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -38,24 +38,21 @@ public:
   static const long LINE_RATE;
   static const int OPT_FLAGS_CPID;
   static const int OPT_FLAGS_PMP;
-  static const int DEFAULT_SELECTOR;
+  static const int SELECTOR;
 
   // = Initialization methods.
-  ACE_ATM_Addr (unsigned char selector = DEFAULT_SELECTOR);
+  ACE_ATM_Addr (void);
   // Default constructor.
 
-  ACE_ATM_Addr (const ACE_ATM_Addr &,
-                unsigned char selector = DEFAULT_SELECTOR);
+  ACE_ATM_Addr (const ACE_ATM_Addr &);
   // Copy constructor.
 
-  ACE_ATM_Addr (const ATMSAPAddress *,
-                unsigned char selector = DEFAULT_SELECTOR);
+  ACE_ATM_Addr (const ATMSAPAddress *);
   // 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);
+  ACE_ATM_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"
@@ -65,22 +62,19 @@ public:
   // Default dtor.
 
   // = Initialization methods (useful after object construction).
-  void init (unsigned char selector = DEFAULT_SELECTOR);
+  void init (void);
   // 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);
+  int set (const ACE_ATM_Addr &);
   // Initializes from another <ACE_ATM_Addr>.
 
-  int set (const ATMSAPAddress *,
-           unsigned char selector = DEFAULT_SELECTOR);
+  int set (const ATMSAPAddress *);
   // 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);
+  int set (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"
@@ -113,12 +107,6 @@ public:
   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
diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.i
index 0fb582ae719..86a0c3ccc8c 100644
--- a/ace/ATM_Addr.i
+++ b/ace/ATM_Addr.i
@@ -17,25 +17,3 @@ 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/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..9a87f63c893 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -969,14 +969,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 *
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index fb555a90610..4e1c72d18b6 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -1002,12 +1002,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.
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index 834817032b5..6cdbcc058cd 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -81,7 +81,7 @@ public:
 
   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
+  // 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.
 
@@ -272,18 +272,6 @@ public:
   // 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.
@@ -330,18 +318,6 @@ public:
   // 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.
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..8b8f517840f 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -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;
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 22634aefbc3..36c2f683526 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -49,7 +49,6 @@
 #define ACE_CDR_H
 
 #include "ace/Message_Block.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -130,13 +129,13 @@ public:
   // 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 +151,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.
@@ -410,9 +409,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;
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index 529eb077061..811bf84d670 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -157,9 +157,7 @@ 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);
+  ACE_CDR::mb_align (&this->start_);
 }
 
 // Decode the CDR stream.
@@ -427,12 +425,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
 {
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index c540e5af1f6..7b115f21745 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -363,13 +363,13 @@
   ACE_Guard<MUTEX> OBJ (LOCK); \
     if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
 
-# define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
+# define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK) \
   ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
+    if (OBJ.locked () == 0) return;
 
-# define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
+# define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK) \
   ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
+    if (OBJ.locked () == 0) return;
 
 // The following ACE_GUARD_THROW* macros are to be depricated soon.
 // -------------------- Start Depricated --------------------
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index a0e12e99768..db6c640a9bf 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -438,7 +438,7 @@ ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
                                         reuse_addr,
                                         flags,
                                         perms);
-
+    
   // Delegate to connection strategy.
   if (result == -1)
     {
@@ -615,7 +615,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 +626,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 +638,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);
 
diff --git a/ace/Containers.h b/ace/Containers.h
index eb9b107b74f..7423348cbcb 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
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 44ab889ab61..78d7516369c 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -146,7 +146,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 +185,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 +202,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_;
 
@@ -228,10 +228,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 +240,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 +261,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 +318,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 +336,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 +355,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 +438,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 +452,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 +466,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 +488,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 +514,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 +771,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 +1190,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 +1203,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 +1237,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 +1447,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 +1473,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 +1536,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 +1553,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 +1656,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;
     }
 }
@@ -1960,11 +1934,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 +1999,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 +2150,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 +2194,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 +2221,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 +2231,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 +2241,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 ();
+  ACE_NEW (this->array_, T[size]);
 
-  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 (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,18 +2268,12 @@ 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).
@@ -2350,21 +2287,16 @@ ACE_Array_Base<T>::operator= (const ACE_Array_Base<T> &s)
     {
       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);
+          delete [] this->array_;
+          ACE_NEW (this->array_,
+                   T[s.size ()]);
           this->max_size_ = s.size ();
         }
 
       this->cur_size_ = 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];
     }
 }
 
@@ -2391,7 +2323,7 @@ ACE_Array_Base<T>::get (T &item, size_t index) const
      {
        // 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];  
        return 0;
      }
    else
@@ -2403,31 +2335,19 @@ 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..e8b8bb16518 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:
 
@@ -1400,13 +1398,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);
@@ -1481,9 +1476,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>;
 };
 
@@ -1508,13 +1500,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..ebca9194910 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)
 {
 }
 
@@ -456,9 +451,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..f443ab7cc1a 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
@@ -140,21 +140,21 @@ ACE_DLL::get_handle (int become_owner)
   return this->handle_;
 }
 
-// Set the handle for the DLL. By default, the object will be closed
+// 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,
+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 ()),
+                       "%s\n", this->error ()),
                       -1);
-
+  
   this->handle_ = handle;
   this->close_on_destruction_ = close_on_destruction;
-
+  
   return 0;
 }
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..794ebb19e89 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -136,7 +136,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 +147,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 +155,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 +163,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;
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..45c1921b6ce 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;
 	}
     }			
@@ -142,7 +142,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 +155,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/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index edd5acbac21..71d3171d99e 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -73,11 +73,11 @@ 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_;
-
+              {
+                // High-Res timers not supported
+                ACE_High_Res_Timer::global_scale_factor_status_ = -1;  
+                return ACE_High_Res_Timer::global_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
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 676e47f24cb..cce0a843b5d 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -178,11 +178,11 @@ public:
   // However, setting the global_scale_factor_ appropriately will
   // result in the finest resolution possible.
 
+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
@@ -208,9 +208,9 @@ private:
   // global_scale_factor_ == microseconds.
 
   static int global_scale_factor_status_;
-  // Indicates the status of the global scale factor,
+  // Indicates the status of the global scale factor, 
   // 0  = hasn't been set
-  // 1  = been set
+  // 1  = been set 
   // -1 = HR timer not supported
 };
 
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 341863d32c4..7261ca1a1bb 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 */
 
@@ -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..7ec82e21ced 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);
@@ -249,7 +249,7 @@ 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.
+// ACE_Log_Msg instances, as well as the current instance.
 
 void
 ACE_Log_Msg::enable_debug_messages (ACE_Log_Priority priority)
@@ -260,7 +260,7 @@ ACE_Log_Msg::enable_debug_messages (ACE_Log_Priority priority)
 }
 
 // Clears the flag in the default priority mask used to initialize
-// ACE_Log_Msg instances, as well as the current per-thread instance.
+// ACE_Log_Msg instances, as well as the current instance.
 
 void
 ACE_Log_Msg::disable_debug_messages (ACE_Log_Priority priority)
@@ -285,7 +285,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 +299,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 +340,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 +350,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 +359,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 +376,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 +426,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 +441,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 +486,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 +1046,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 +1180,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..0452d7b7db1 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
@@ -184,7 +184,7 @@ public:
   static void disable_debug_messages (ACE_Log_Priority priority = LM_DEBUG);
   // Clears the 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.
@@ -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_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/Makefile b/ace/Makefile
index 9fd14f2ccaa..add0382348e 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -169,9 +169,7 @@ OTHER_FILES = \
   Registry_Name_Space \
   Remote_Name_Space \
   TP_Reactor \
-  XtReactor \
-  FlReactor \
-  TkReactor
+  XtReactor
 
 TEMPLATE_FILES = \
            Acceptor \
@@ -459,13 +457,6 @@ ifeq ($(CHORUS),1)
   endif # CC
 endif # CHORUS
 
-ifneq ($(GHS),)
-  ifeq ($(CPU),86)
-    $(VDIR)gethrtime.$(OBJEXT):
-	make $@ ghs=0
-  endif # 86
-endif # GHS
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
@@ -478,27 +469,34 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Template_Instantiations.cpp
-.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \
+.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/streams.h \
  $(ACE_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.h \
  $(ACE_ROOT)/ace/Sched_Params.i
@@ -509,27 +507,34 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
+.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.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/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.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
@@ -553,13 +558,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -581,7 +589,6 @@ endif # GHS
  $(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 \
@@ -610,8 +617,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 \
@@ -631,31 +636,37 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
-.obj/ARGV.o .obj/ARGV.so .shobj/ARGV.o .shobj/ARGV.so: ARGV.cpp $(ACE_ROOT)/ace/ARGV.h \
+.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/streams.h \
  $(ACE_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 \
@@ -700,16 +711,18 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -756,12 +769,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -795,12 +811,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -834,7 +853,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 +873,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 \
@@ -876,13 +892,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -895,12 +914,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Hash_Map_Manager.o .obj/Hash_Map_Manager.so .shobj/Hash_Map_Manager.o .shobj/Hash_Map_Manager.so: Hash_Map_Manager.cpp \
@@ -910,13 +932,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -948,7 +973,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 +995,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 \
@@ -992,17 +1014,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1048,13 +1072,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .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 \
@@ -1063,13 +1090,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
@@ -1094,7 +1124,6 @@ endif # GHS
  $(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 \
@@ -1118,8 +1147,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 \
@@ -1167,12 +1194,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1185,13 +1215,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/SString.o .obj/SString.so .shobj/SString.o .shobj/SString.so: SString.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
@@ -1201,14 +1234,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1251,8 +1286,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 \
@@ -1275,15 +1308,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1329,13 +1364,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Memory_Pool.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1354,7 +1392,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 \
@@ -1384,30 +1421,33 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.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/streams.h \
  $(ACE_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
 .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 \
@@ -1419,13 +1459,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1447,7 +1490,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 \
@@ -1484,13 +1526,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1512,7 +1557,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 \
@@ -1543,13 +1587,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1571,7 +1618,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 \
@@ -1599,15 +1645,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1659,13 +1707,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -1687,7 +1738,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 \
@@ -1719,12 +1769,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -1753,12 +1806,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Manager.h \
  $(ACE_ROOT)/ace/Thread.h \
@@ -1776,7 +1832,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 \
@@ -1801,20 +1856,21 @@ endif # GHS
  $(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/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/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
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_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
 .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 \
@@ -1823,25 +1879,31 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/ACE.i \
  $(ACE_ROOT)/ace/Log_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/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/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/Activation_Queue.o .obj/Activation_Queue.so .shobj/Activation_Queue.o .shobj/Activation_Queue.so: Activation_Queue.cpp \
  $(ACE_ROOT)/ace/Activation_Queue.h \
@@ -1853,12 +1915,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -1875,7 +1940,6 @@ endif # GHS
  $(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 \
@@ -1914,8 +1978,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 \
@@ -1960,17 +2022,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Log_Record.i \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/Containers.h \
@@ -2021,12 +2083,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -2041,9 +2106,6 @@ endif # GHS
  $(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
@@ -2055,12 +2117,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch_T.h \
@@ -2088,12 +2153,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Options.i
 .obj/Thread.o .obj/Thread.so .shobj/Thread.o .shobj/Thread.so: Thread.cpp \
@@ -2104,12 +2172,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/Thread_Manager.o .obj/Thread_Manager.so .shobj/Thread_Manager.o .shobj/Thread_Manager.so: Thread_Manager.cpp \
@@ -2121,12 +2192,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -2142,7 +2216,6 @@ endif # GHS
  $(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 \
@@ -2180,12 +2253,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2210,17 +2286,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Message_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 \
@@ -2279,12 +2357,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \
@@ -2295,13 +2376,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .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 \
@@ -2311,15 +2395,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -2388,119 +2474,23 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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/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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(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/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/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/Managed_Object.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 \
@@ -2510,12 +2500,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2541,7 +2534,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 \
@@ -2568,8 +2560,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/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
@@ -2638,12 +2628,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2659,7 +2652,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 \
@@ -2712,12 +2704,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2733,7 +2728,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 \
@@ -2800,12 +2794,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2821,7 +2818,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 \
@@ -2866,8 +2862,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 \
@@ -2907,13 +2901,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .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 \
@@ -2921,13 +2918,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -2937,13 +2937,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -2954,12 +2957,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +2991,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 \
@@ -3014,8 +3019,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/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -3060,12 +3063,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3077,12 +3083,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3102,12 +3111,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3137,12 +3149,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3167,12 +3182,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3202,12 +3220,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3229,12 +3250,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3250,19 +3274,23 @@ endif # GHS
  $(ACE_ROOT)/ace/LSOCK.h \
  $(ACE_ROOT)/ace/LSOCK.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.i
-.obj/SOCK.o .obj/SOCK.so .shobj/SOCK.o .shobj/SOCK.so: SOCK.cpp $(ACE_ROOT)/ace/SOCK.h \
+.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/streams.h \
  $(ACE_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 \
@@ -3280,12 +3308,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3322,12 +3353,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3347,12 +3381,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3376,12 +3413,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3414,12 +3454,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3441,12 +3484,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3466,12 +3512,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3491,12 +3540,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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,40 +3559,27 @@ 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/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/streams.h \
  $(ACE_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.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/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/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/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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -3548,21 +3587,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -3573,18 +3612,18 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
+ $(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 \
@@ -3596,21 +3635,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
  $(ACE_ROOT)/ace/DEV_Connector.i
@@ -3624,24 +3663,25 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
+.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 \
@@ -3649,12 +3689,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
@@ -3668,12 +3711,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3689,12 +3735,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3710,12 +3759,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3731,12 +3783,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3751,19 +3806,20 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/FILE_Addr.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 \
@@ -3771,21 +3827,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -3798,21 +3854,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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
@@ -3826,21 +3882,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -3851,12 +3907,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3869,12 +3928,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3884,13 +3946,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3912,12 +3977,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -3943,12 +4011,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -3964,7 +4035,6 @@ endif # GHS
  $(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 \
@@ -3996,18 +4066,18 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i
 .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 \
@@ -4017,21 +4087,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -4044,21 +4114,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -4072,21 +4142,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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
@@ -4100,21 +4170,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -4125,12 +4195,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -4141,12 +4214,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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.h \
  $(ACE_ROOT)/ace/SV_Message.i \
@@ -4160,12 +4236,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
@@ -4177,12 +4256,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/SV_Shared_Memory.o .obj/SV_Shared_Memory.so .shobj/SV_Shared_Memory.o .shobj/SV_Shared_Memory.so: SV_Shared_Memory.cpp \
@@ -4193,15 +4275,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Shared_Memory.i
-.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp $(ACE_ROOT)/ace/TLI.h \
+.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 \
@@ -4209,17 +4295,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i
+ $(ACE_ROOT)/ace/Addr.i
 .obj/TLI_Acceptor.o .obj/TLI_Acceptor.so .shobj/TLI_Acceptor.o .shobj/TLI_Acceptor.so: TLI_Acceptor.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -4230,23 +4318,23 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
  $(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/INET_Addr.i
 .obj/TLI_Connector.o .obj/TLI_Connector.so .shobj/TLI_Connector.o .shobj/TLI_Connector.so: TLI_Connector.cpp \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -4255,12 +4343,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -4270,11 +4361,8 @@ endif # GHS
  $(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/INET_Addr.i
 .obj/TLI_Stream.o .obj/TLI_Stream.so .shobj/TLI_Stream.o .shobj/TLI_Stream.so: TLI_Stream.cpp \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -4285,20 +4373,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
  $(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/INET_Addr.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 \
@@ -4306,21 +4395,21 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -4338,12 +4427,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
@@ -4357,17 +4449,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +4517,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 \
@@ -4495,17 +4587,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +4655,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 \
@@ -4631,17 +4723,19 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +4791,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 \
@@ -4755,19 +4847,23 @@ 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 \
+.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_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/Parse_Node.o .obj/Parse_Node.so .shobj/Parse_Node.o .shobj/Parse_Node.so: Parse_Node.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -4779,12 +4875,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -4804,7 +4903,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 \
@@ -4827,8 +4925,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 \
@@ -4899,14 +4995,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -4950,8 +5048,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 \
@@ -5004,12 +5100,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5037,7 +5136,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Service_Config.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,8 +5158,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 \
@@ -5132,12 +5228,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5167,12 +5266,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5207,12 +5309,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5235,7 +5340,6 @@ endif # GHS
  $(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 \
@@ -5275,8 +5379,6 @@ endif # GHS
  $(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 \
@@ -5327,12 +5429,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .obj/Svc_Conf_l.o .obj/Svc_Conf_l.so .shobj/Svc_Conf_l.o .shobj/Svc_Conf_l.so: Svc_Conf_l.cpp \
@@ -5341,18 +5446,20 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +5503,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 \
@@ -5421,15 +5526,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 +5583,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 \
@@ -5551,15 +5656,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -5601,8 +5708,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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 \
@@ -5612,15 +5717,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -5672,15 +5779,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -5733,8 +5842,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 \
@@ -5770,7 +5877,8 @@ endif # GHS
  $(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 \
+.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 \
@@ -5779,12 +5887,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5804,7 +5915,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 \
@@ -5844,8 +5954,6 @@ endif # GHS
  $(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 \
@@ -5895,14 +6003,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5948,12 +6058,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -5964,12 +6077,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
@@ -5987,7 +6103,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 \
@@ -6021,14 +6136,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6075,15 +6192,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -6127,8 +6246,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 \
@@ -6148,12 +6265,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .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 \
@@ -6164,12 +6284,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
@@ -6183,12 +6306,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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_Shared_Memory.h \
  $(ACE_ROOT)/ace/SV_Shared_Memory.i \
@@ -6201,12 +6327,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6223,7 +6352,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 \
@@ -6257,8 +6385,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 \
@@ -6282,12 +6408,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6321,7 +6450,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 \
@@ -6353,8 +6481,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 \
@@ -6381,13 +6507,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -6406,7 +6535,6 @@ endif # GHS
  $(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 \
@@ -6435,8 +6563,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 \
@@ -6462,12 +6588,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6486,7 +6615,6 @@ endif # GHS
  $(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 \
@@ -6515,8 +6643,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 \
@@ -6542,12 +6668,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6566,7 +6695,6 @@ endif # GHS
  $(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 \
@@ -6595,8 +6723,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 \
@@ -6624,12 +6750,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Synch.h \
@@ -6644,7 +6773,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 \
@@ -6678,8 +6806,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 \
@@ -6705,12 +6831,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6730,7 +6859,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 +6881,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 \
@@ -6778,12 +6904,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/CORBA_Ref.i \
  $(ACE_ROOT)/ace/CORBA_Ref.cpp
@@ -6794,17 +6923,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Local_Name_Space.h \
  $(ACE_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 \
@@ -6903,12 +7032,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -6924,7 +7056,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 \
@@ -6969,8 +7100,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 \
@@ -7010,12 +7139,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -7052,7 +7184,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 \
@@ -7075,8 +7206,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 \
@@ -7099,17 +7228,17 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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 \
@@ -7118,16 +7247,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
@@ -7209,18 +7338,18 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/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/Log_Record.i \
+ $(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 \
@@ -7317,13 +7446,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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
 .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 \
@@ -7333,16 +7465,16 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
@@ -7430,12 +7562,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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 \
@@ -7451,7 +7586,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 \
@@ -7504,183 +7638,15 @@ endif # GHS
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_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/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(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 \
- $(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/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/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/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/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/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/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/OS.h \
- $(ACE_ROOT)/ace/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/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -7711,13 +7677,12 @@ endif # GHS
  $(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/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 \
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 36e938da735..c1621456b08 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -222,7 +222,6 @@ libACE_Sockets_la_SOURCES = \
 
 libACE_IPC_la_SOURCES = \
         Addr.cpp \
-	ATM_Addr.cpp \
         DEV.cpp \
         DEV_Addr.cpp \
         DEV_Connector.cpp \
@@ -326,11 +325,6 @@ libACE_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:
 ##
@@ -400,7 +394,6 @@ ACE_TEMPLATE_FILES = \
         Message_Block_T.cpp \
         Message_Queue_T.cpp \
         Module.cpp \
-	Pair_T.cpp \
         RB_Tree.cpp \
         Select_Reactor_T.cpp \
         Singleton.cpp \
@@ -435,8 +428,6 @@ pkginclude_HEADERS = \
         ACE.i \
         ARGV.h \
         ARGV.i \
-	ATM_Addr.h \
-	ATM_Addr.i \
         Acceptor.h \
         Acceptor.i \
         Activation_Queue.h \
@@ -770,6 +761,7 @@ pkginclude_HEADERS = \
         Timer_List.h \
         Timer_List_T.h \
         Timer_Queue.h \
+        Timer_Queue.i \
         Timer_Queue_Adapters.h \
         Timer_Queue_Adapters.i \
         Timer_Queue_T.h \
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..99bd092c70c 100644
--- a/ace/Map_Manager.i
+++ b/ace/Map_Manager.i
@@ -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,50 @@ 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_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_);
 }
 
diff --git a/ace/Map_T.i b/ace/Map_T.i
index ed64cf6d6a7..ffbcac60397 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.i
@@ -572,10 +572,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_TYPENAME 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
@@ -628,10 +627,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_TYPENAME 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
@@ -1038,10 +1036,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_TYPENAME 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
@@ -1094,10 +1091,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_TYPENAME 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
@@ -1354,10 +1350,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_TYPENAME 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
@@ -1410,10 +1405,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_TYPENAME 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
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index b8a3567fa6d..868ab49ede8 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);
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 87e4271b777..0b890748dc8 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -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),
@@ -298,13 +283,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
+                    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)
+ACE_Message_Block::ACE_Message_Block (void)
   : data_block_ (0)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
@@ -320,8 +304,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,8 +318,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)
+                                      ACE_Allocator *data_block_allocator)
   : data_block_ (0)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
@@ -352,8 +334,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 +349,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 +364,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 +385,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,8 +399,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)
+                                      ACE_Allocator *data_block_allocator)
   : data_block_ (0)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
@@ -438,14 +415,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)
+ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block)
   : data_block_ (0)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
@@ -460,9 +435,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 +453,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);
@@ -494,8 +467,6 @@ ACE_Message_Block::init_i (size_t size,
   this->next_ = 0;
   this->prev_ = 0;
 
-  this->message_block_allocator_ = message_block_allocator;
-
   if (this->data_block_ != 0)
     {
       this->data_block_->release ();
@@ -712,13 +683,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 +740,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 +839,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..dc7f989bcab 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.
@@ -396,8 +359,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 +377,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,10 +409,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 &);
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..7006e18e5ae 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -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/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..3ba42a9b867 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -205,7 +205,6 @@ ACE_OS::netdb_release (void)
 ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0;
 
 // 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
@@ -213,7 +212,7 @@ const ACE_Time_Value ACE_Time_Value::zero;
 // 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.
+
 const ACE_Time_Value ACE_Time_Value::max_time (LONG_MAX,
                                                ACE_ONE_SECOND_IN_USECS - 1);
 
@@ -254,7 +253,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 +300,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 +398,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 +418,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 +445,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 +611,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 +640,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 +679,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 +729,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 +776,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 +797,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 +817,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 +845,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 +877,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 +889,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 +902,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 +913,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;
 
@@ -957,7 +955,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 +971,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 +984,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 +1001,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;
@@ -1025,13 +1023,11 @@ ACE_OS::mktemp (wchar_t *s)
           // 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);
+          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 +1045,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 +1058,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 +1071,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 +1081,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)
 {
@@ -1254,7 +1255,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,7 +1390,6 @@ 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)
@@ -1421,19 +1421,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 +1443,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,7 +1460,7 @@ 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)
@@ -1469,7 +1469,7 @@ ACE_TSS_Info::ACE_TSS_Info (void)
     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 +1490,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 +1499,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);
 }
@@ -1655,7 +1655,7 @@ 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 info_arr[ACE_DEFAULT_THREAD_KEYS];
@@ -1797,13 +1797,13 @@ ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
   , in_use_key_ (ACE_TSS_Emulation::total_keys ())
 #endif /* ACE_HAS_TSS_EMULATION */
 {
-  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)
@@ -1827,7 +1827,7 @@ ACE_TSS_Cleanup::insert (ACE_thread_key_t key,
                          void (*destructor)(void *),
                          void *inst)
 {
-ACE_TRACE ("ACE_TSS_Cleanup::insert");
+// ACE_TRACE ("ACE_TSS_Cleanup::insert");
   ACE_TSS_CLEANUP_GUARD
 
   ACE_KEY_INDEX (key_index, key);
@@ -1845,7 +1845,7 @@ ACE_TRACE ("ACE_TSS_Cleanup::insert");
 int
 ACE_TSS_Cleanup::remove (ACE_thread_key_t key)
 {
-  ACE_TRACE ("ACE_TSS_Cleanup::remove");
+  // ACE_TRACE ("ACE_TSS_Cleanup::remove");
   ACE_TSS_CLEANUP_GUARD
 
   ACE_KEY_INDEX (key_index, key);
@@ -2404,7 +2404,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
@@ -2452,7 +2452,7 @@ 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");
+// 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 ())
@@ -2482,7 +2482,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))
@@ -3319,7 +3319,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);
@@ -3461,7 +3461,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)
@@ -3492,7 +3492,7 @@ 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);
@@ -3551,7 +3551,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);
@@ -3590,7 +3590,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 +3644,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)
@@ -4030,100 +4030,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 +4038,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 +4066,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 +4084,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 +4102,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 +4140,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 +4148,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;
@@ -4264,12 +4170,11 @@ ACE_OS::mktemp (char *s)
           // 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);
+          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
@@ -4435,7 +4340,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));
@@ -4794,7 +4699,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);
@@ -4913,7 +4818,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))
@@ -5181,7 +5086,7 @@ ACE_OS::ctime_r (const time_t *clock,
 time_t
 ACE_OS::mktime (struct tm *t)
 {
-  ACE_TRACE ("ACE_OS::mktime");
+  // ACE_TRACE ("ACE_OS::mktime");
 #   if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
   ACE_UNUSED_ARG (t);
   ACE_NOTSUP_RETURN (-1);
@@ -5270,7 +5175,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
 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_WTHREADS)
   ACE_OS::event_destroy (&cv->waiters_done_);
@@ -5288,7 +5193,7 @@ ACE_OS::cond_destroy (ACE_cond_t *cv)
 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");
 # if defined (ACE_HAS_THREADS)
   cv->waiters_ = 0;
   cv->was_broadcast_ = 0;
@@ -5317,7 +5222,7 @@ ACE_TRACE ("ACE_OS::cond_init");
 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 there aren't any waiters, then this is a no-op.  Note that
   // this function *must* be called with the <external_mutex> held
@@ -5342,7 +5247,7 @@ ACE_TRACE ("ACE_OS::cond_signal");
 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)
   // The <external_mutex> must be locked before this call is made.
 
@@ -5390,7 +5295,7 @@ 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)
   // Prevent race conditions on the <waiters_> count.
   ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
@@ -5485,7 +5390,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)
   // Handle the easy case first.
   if (timeout == 0)
@@ -5633,10 +5538,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
       /* 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)
+  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_);
@@ -5665,7 +5567,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
                         ACE_thread_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)
   // Handle the easy case first.
   if (timeout == 0)
@@ -5754,7 +5656,7 @@ int
 ACE_OS::cond_wait (ACE_cond_t *cv,
                    ACE_thread_mutex_t *external_mutex)
 {
-  ACE_TRACE ("ACE_OS::cond_wait");
+  // ACE_TRACE ("ACE_OS::cond_wait");
 #   if defined (ACE_HAS_THREADS)
   ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
   cv->waiters_++;
@@ -5821,7 +5723,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
 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.
@@ -6123,7 +6025,7 @@ ACE_OS_WString::ACE_OS_WString (const ACE_USHORT16 *s)
 {
   size_t len = ACE_OS::strlen (s);
   ACE_NEW (this->rep_,
-           char[len+1]);
+           char[len]);
 
   for (size_t i = 0; i < len; i++)
     {
@@ -6140,7 +6042,7 @@ ACE_OS_CString::ACE_OS_CString (const char *s)
 {
   size_t len = ACE_OS::strlen (s);
   ACE_NEW (this->rep_,
-           ACE_USHORT16[len+1]);
+           ACE_USHORT16[len]);
 
   for (size_t i = 0; i < len; i++)
     this->rep_[i] = s[i];
@@ -6201,25 +6103,21 @@ void *ACE_OS_Object_Manager::preallocated_object[
 
 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().
+  // If Instance_ was not 0, then another ACE_OS_Object_Manager has
+  // already been instantiated.  Because this might be the non-static
+  // instance (with ACE_HAS_NONSTATIC_OBJECT_MANAGER), use it and leak
+  // the old one.  We can't destroy it, because the application might
+  // be using some of its resources, via static constructors.
 
-  // 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 ();
 }
 
 ACE_OS_Object_Manager::~ACE_OS_Object_Manager ()
 {
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
   fini ();
 }
 
@@ -6237,7 +6135,9 @@ ACE_OS_Object_Manager::instance (void)
       ACE_NEW_RETURN (instance_pointer, ACE_OS_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 */
 
     }
 
@@ -6249,48 +6149,45 @@ ACE_OS_Object_Manager::init (void)
 {
   if (starting_up_i ())
     {
-      // First, indicate that this ACE_OS_Object_Manager instance is being
+      // First, indicate that the 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_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_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)")));
+          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)")));
+      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);
+      // 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);
-        }
+      // 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.
@@ -6303,10 +6200,6 @@ ACE_OS_Object_Manager::init (void)
     }
 }
 
-// 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)
 {
@@ -6330,66 +6223,51 @@ ACE_OS_Object_Manager::fini (void)
       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 ();
+  // Close down Winsock (no-op on other platforms).
+  ACE_OS::socket_fini ();
 
 #if ! defined (ACE_HAS_STATIC_PREALLOCATION)
-      // Cleanup the dynamically preallocated objects.
+  // 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 (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)")));
+    ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK)
+    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)")));
+    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)
+    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)")));
+    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.
+  // Indicate that the ACE_OS_Object_Manager instance has been shut down.
   object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
   if (dynamically_allocated_)
     {
-      delete this;
+      delete instance_;
+      instance_ = 0;
     }
-
-  if (this == instance_)
-    instance_ = 0;
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
   return 0;
 }
diff --git a/ace/OS.h b/ace/OS.h
index df4539cee6e..0410060d3dc 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -118,6 +118,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 +158,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 */
@@ -560,14 +561,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;
@@ -726,14 +727,9 @@ typedef int key_t;
       typedef unsigned int  uint_t;
       typedef unsigned long ulong_t;
       typedef char *caddr_t;
+      //typedef long pid_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
 
@@ -792,7 +788,7 @@ 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) */
+#    endif //PSOS_PPC
 
 
 // Use pSOS semaphores, wrapped . . .
@@ -994,17 +990,17 @@ 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) && !defined (ACE_PSOS_DIAB_PPC) //sandass
 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) */
+#   endif
+
+#   if !defined(USER_INCLUDE_SYS_TIME_TM) && defined (ACE_PSOS_DIAB_PPC) //sandass
+typedef struct timespec timespec_t; //sandass
+#   endif //sandass
 
 #if defined (ACE_PSOS_HAS_TIME)
 
@@ -1118,9 +1114,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 */
@@ -1815,12 +1814,6 @@ struct stat
 #   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)
@@ -2193,8 +2186,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 +2202,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 +2213,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 +2385,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,18 +2400,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
@@ -2474,12 +2451,8 @@ 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;
@@ -2637,17 +2610,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
@@ -3417,7 +3379,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 +3412,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 +3437,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 +3458,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>
@@ -3813,18 +3757,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 */
@@ -4814,7 +4746,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);
@@ -5052,9 +4984,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);
@@ -5204,14 +5133,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 +5153,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 +5313,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 +5328,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 +5368,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 +5384,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,
@@ -6052,14 +5949,10 @@ protected:
 
 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).
+  // Explicitly initialize.
 
   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.
+  // Explicitly destroy.
 
   enum Object_Manager_State
     {
@@ -6548,11 +6441,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) \
@@ -6604,209 +6493,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 */
 
@@ -7153,10 +6871,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
@@ -7166,8 +6880,10 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 # 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"
+# include "ace/Trace.h"
+
+// These need to come here to avoid problems with circular dependencies.
+# include "ace/Log_Msg.h"
 # endif /* ! ACE_HAS_MINIMAL_ACE_OS */
 
 // The following are some insane macros that are useful in cases when
diff --git a/ace/OS.i b/ace/OS.i
index c202b4d0d2e..face73cb92c 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_;
 }
 
@@ -207,7 +207,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 +223,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 +238,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;
@@ -276,7 +276,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 +285,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 +294,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 +303,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 +315,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 +324,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 +334,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 +344,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 +374,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 +385,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 +397,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 +411,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 ();
@@ -484,7 +484,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 +503,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 +541,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 +561,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 +585,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 +604,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 +626,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 +650,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 +675,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 +686,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 +739,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 +753,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 +766,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 +777,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 +788,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 +797,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 +809,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 +824,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 +834,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 +851,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 +864,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,7 +872,7 @@ 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)
@@ -900,7 +892,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 +945,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,7 +970,7 @@ ACE_INLINE time_t
 ACE_OS::time (time_t *tloc)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::time");
+  // 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
@@ -1000,14 +991,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,7 +1006,7 @@ 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_),
@@ -1049,7 +1040,7 @@ ACE_OS::rename (const char *old_name, const char *new_name)
 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 +1065,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 +1078,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 +1092,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 +1116,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 +1149,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 +1157,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 +1169,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 +1183,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 +1197,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 +1219,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 +1244,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 +1257,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 +1274,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 +1306,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 +1356,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 +1375,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 +1394,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,7 +1402,6 @@ ACE_INLINE char *
 ACE_OS::strcpy (char *s, const char *t)
 {
   // ACE_TRACE ("ACE_OS::strcpy");
-
   return ::strcpy (s, t);
 }
 
@@ -1451,7 +1421,7 @@ ACE_OS::strecpy (char *s, const char *t)
 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 +1453,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 +1477,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 +1508,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 +1539,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 +1553,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 +1592,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 +1608,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 +1629,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 +1652,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 +1686,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 +1767,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 +1806,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.
@@ -1889,7 +1858,7 @@ ACE_INLINE int
 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 +1895,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 +2018,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 +2089,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 +2108,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 +2127,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 +2157,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);
@@ -2213,7 +2182,7 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 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 +2202,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 +2216,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 +2259,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 +2280,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 +2305,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 +2330,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;
@@ -2455,7 +2424,7 @@ ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2)
 ACE_INLINE void
 ACE_OS::thr_self (ACE_hthread_t &self)
 {
-  ACE_TRACE ("ACE_OS::thr_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.
@@ -2479,7 +2448,7 @@ ACE_OS::thr_self (ACE_hthread_t &self)
 ACE_INLINE ACE_thread_t
 ACE_OS::thr_self (void)
 {
-  ACE_TRACE ("ACE_OS::thr_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.
@@ -2649,7 +2618,7 @@ ACE_OS::recursive_mutex_unlock (ACE_recursive_thread_mutex_t *m)
 #if defined (ACE_HAS_RECURSIVE_MUTEXES)
   return ACE_OS::thread_mutex_unlock (m);
 #else
-ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
 #if !defined (ACE_NDEBUG)
   ACE_thread_t t_id = ACE_OS::thr_self ();
 #endif /* ACE_NDEBUG */
@@ -2696,7 +2665,7 @@ ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
 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)
@@ -2766,7 +2735,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);
@@ -2953,7 +2922,7 @@ 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);
 # elif defined (ACE_HAS_THREADS)
@@ -3037,7 +3006,7 @@ 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);
@@ -3143,7 +3112,7 @@ 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);
 # elif defined (ACE_HAS_THREADS)
@@ -3251,7 +3220,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);
@@ -3444,7 +3413,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 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 +3449,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 +3485,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 +3528,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 +3573,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 +3631,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 +3712,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,17 +4110,18 @@ 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)
+#if !defined (ACE_PSOS_DIAB_PPC)
+// sandass was here
 ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                 (ACE_SOCKET_LEN *) addrlen),
                       ACE_HANDLE, ACE_INVALID_HANDLE);
-#  else
+#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 */
+#endif /* defined ACE_PSOS_DIAB_PPC */
 #else
   // On a non-blocking socket with no connections to accept, this system
   // call will return EWOULDBLOCK or EAGAIN, depending on the platform.
@@ -4181,34 +4151,50 @@ 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)
+
+// sandass was here
+#if !defined (ACE_PSOS_DIAB_PPC)
   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,  (struct sockaddr *) addr,
+                               (ACE_SOCKET_LEN) addrlen),
+                       int, -1);
+#endif /*defined 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)
+// sandass was here
+#if !defined (ACE_PSOS_DIAB_PPC)
   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, (struct sockaddr *) addr,
+                                  (ACE_SOCKET_LEN) addrlen),
+                       int, -1);
+#endif /*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 +4206,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 +4231,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 +4254,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 +4273,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 +4302,18 @@ 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
+// sandass was here
+#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
+#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 */
+#endif /* defined ACE_PSOS_DIAB_PPC */
 #elif defined (ACE_WIN32)
   int result = ::recvfrom ((ACE_SOCKET) handle,
                            buf,
@@ -4387,7 +4342,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 +4358,22 @@ 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)
+//sandass was here
+#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
+#else
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf, len, flags,
                                  (struct sockaddr *) addr, addrlen),
                        int, -1);
-#  endif /*defined ACE_PSOS_DIAB_PPC */
+#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,12 +4385,19 @@ 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)
+//sandass was here
+#if !defined ACE_PSOS_DIAB_PPC
   ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #else
+  ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, (struct sockaddr *) addr,
+                                      (ACE_SOCKET_LEN *) addrlen),
+                       int, -1);
+#endif /* defined ACE_PSOS_DIAB_PPC */
+#else
   ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #endif /* defined (ACE_PSOS) */
@@ -4547,7 +4510,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,12 +4529,19 @@ 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)
+//sandass was here
+#if !defined (ACE_PSOS_DIAB_PPC)
   ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #else
+  ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle, (struct sockaddr *) addr,
+                                      (ACE_SOCKET_LEN *) addrlen),
+                       int, -1);
+#endif /* defined ACE_PSOS_DIAB_PPC */
+#else
   ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
 #endif /* defined (ACE_PSOS) */
@@ -4584,7 +4554,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 +4562,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 +4570,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 +4579,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 +4594,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 +4640,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 +4679,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 +4694,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 +4704,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 +4714,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 +4726,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 +4754,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;
@@ -4814,7 +4784,7 @@ 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)
@@ -4956,7 +4926,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 +4982,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 +5043,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 +5052,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 +5096,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 +5140,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 +5150,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 +5163,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 +5175,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 +5185,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 */
@@ -5296,8 +5204,11 @@ ACE_OS::signal (int signum, ACE_SignalHandler func)
     return 0;
   else
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+//sandass was here
     return (ACE_SignalHandler) ::signal (signum, (void (*)(void)) func);
-#elif defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
+#elif defined (ACE_PSOS_DIAB_MIPS)
+    return 0;
+#elif 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
@@ -5305,11 +5216,11 @@ ACE_OS::signal (int signum, ACE_SignalHandler func)
     //    will take some extra work - deferred for now.
     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);
@@ -5334,7 +5245,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);
@@ -5378,7 +5289,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 +5306,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);
@@ -5462,7 +5373,7 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio)
 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 +5513,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);
@@ -5667,24 +5578,61 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
 #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 (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_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 +5672,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 +5716,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 +5750,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 +5773,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 +5834,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 +5857,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 +5937,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 +5983,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 +6032,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 +6058,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 +6121,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 +6148,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 +6176,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 +6193,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 +6207,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 +6222,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 +6231,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 +6240,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 +6266,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 +6290,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 +6306,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 +6322,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 +6338,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 +6355,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 +6370,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 +6385,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 +6400,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 +6411,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 +6427,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 +6443,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 +6452,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 +6471,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 +6485,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 +6498,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 +6515,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 +6533,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 +6550,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 +6564,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 +6579,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 +6595,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 +6609,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 +6625,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 +6639,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 +6652,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 +6665,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 +6678,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 +6693,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 +6713,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 +6724,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,7 +6740,7 @@ 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)
@@ -6914,7 +6768,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 +6776,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 +6820,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 +6835,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 +6850,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 +6873,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 +6895,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 +6909,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 +6927,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 +6946,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 +6991,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 +7014,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 +7062,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,7 +7107,7 @@ 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 */
@@ -7262,7 +7116,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_WIDE_DL_TYPE symbolname)
 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 +7130,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 +7145,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.
 
@@ -7325,7 +7179,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 +7196,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 +7235,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 +7248,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 +7270,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 +7291,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 +7309,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 +7343,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 +7363,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 +7509,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 +7526,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 +7549,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 +7566,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 +7587,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 +7626,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 +7642,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 +7658,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 +7673,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 +7688,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 +7707,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 +7722,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 +7735,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 +7754,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);
@@ -7968,7 +7822,7 @@ 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)
@@ -7981,7 +7835,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;
@@ -8021,7 +7875,7 @@ 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");
+  // 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 +7888,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);
@@ -8059,7 +7913,7 @@ 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");
+  // ACE_TRACE ("ACE_OS::localtime");
   ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
@@ -8071,7 +7925,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);
@@ -8099,7 +7953,7 @@ 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");
+  // ACE_TRACE ("ACE_OS::asctime");
   ACE_OSCALL_RETURN (::asctime (t), char *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
@@ -8111,7 +7965,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;
@@ -8165,7 +8019,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 +8124,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 +8160,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 +8170,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 +8206,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 +8216,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 +8253,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 +8273,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 +8310,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 +8327,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 +8354,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 +8403,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 +8433,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 +8463,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 +8492,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 +8536,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 +8557,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 +8576,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 +8596,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 +8613,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 +8641,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 +8660,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 ();
@@ -8951,7 +8797,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 +8810,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 +8824,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 +8835,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 +8881,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 +8897,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,7 +8985,7 @@ 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);
 
@@ -9156,7 +9002,7 @@ ACE_OS::wait (int *stat_loc)
 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 +9020,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 +9044,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 +9059,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 +9092,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 +9189,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 +9222,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 +9245,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
@@ -9480,7 +9328,7 @@ ACE_OS::mkdir (const char *path, mode_t mode)
 ACE_INLINE char *
 ACE_OS::getenv (const char *symbol)
 {
-  ACE_TRACE ("ACE_OS::getenv");
+  // ACE_TRACE ("ACE_OS::getenv");
 #if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS)
   ACE_OSCALL_RETURN (::getenv (symbol), char *, 0);
 #else
@@ -9493,7 +9341,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 +9393,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 +9412,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 +9450,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 +9461,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)
@@ -9662,7 +9507,7 @@ 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");
+  // ACE_TRACE ("ACE_OS::strecpy");
   register wchar_t *dscan = s;
   register const wchar_t *sscan = t;
 
@@ -9675,28 +9520,28 @@ ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
 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 +9558,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 +9577,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 +9590,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 +9609,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 +9645,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 +9675,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 +9718,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 +9762,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 +9780,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 +9793,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 +9806,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 +9816,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 +9828,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 +9842,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 +9865,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 +9905,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 +9938,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 +9965,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 +9973,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 +9988,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 +10000,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 +10024,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 +10037,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 +10057,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 +10096,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 +10111,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 ;
@@ -10424,26 +10268,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);
@@ -10456,7 +10284,7 @@ ACE_OS::sbrk (int brk)
 ACE_INLINE long
 ACE_OS_Thread_Descriptor::flags (void) const
 {
-  ACE_TRACE ("ACE_OS_Thread_Descriptor::flags");
+  // ACE_TRACE ("ACE_OS_Thread_Descriptor::flags");
   return flags_;
 }
 
@@ -10810,7 +10638,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 +10652,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 +10672,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 +10680,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) */
 }
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index c6f5e15b430..45617cfeae9 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -164,11 +164,6 @@ ACE_Object_Manager::shutting_down (void)
   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)
 {
@@ -178,45 +173,36 @@ ACE_Object_Manager::init (void)
       // initialized.
       object_manager_state_ = OBJ_MAN_INITIALIZING;
 
-      // Only The Instance sets up with ACE_OS_Object_Manager and initializes
-      // the preallocated objects.
-      if (this == instance_)
-        {
-          // 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;
+      // 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_);
+      // 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 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_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_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_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)
 #     endif /* ACE_MT_SAFE */
-        }
 
       // Do this after the allocation of ACE_STATIC_OBJECT_LOCK.  It
       // shouldn't matter, but just in case
@@ -224,23 +210,19 @@ ACE_Object_Manager::init (void)
       ACE_NEW_RETURN (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 (ts_storage_);
 #     endif /* ACE_HAS_TSS_EMULATION */
 
-          ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations,
-                          -1);
+      ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations, -1);
 
-          // Open the main thread's ACE_Log_Msg.
-          (void) ACE_LOG_MSG;
-        }
+      // Open the main thread's ACE_Log_Msg.
+      (void) ACE_LOG_MSG;
 
       ACE_NEW_RETURN (default_mask_, ACE_Sig_Set (1), -1);
 
@@ -268,25 +250,21 @@ ACE_Object_Manager::ACE_Object_Manager (void)
   , 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;
+  // If Instance_ was not 0, then another ACE_Object_Manager has
+  // already been instantiated.  Because this might be the non-static
+  // instance (with ACE_HAS_NONSTATIC_OBJECT_MANAGER), use it and leak
+  // the old one.  We can't destroy it, because the application might
+  // be using some of its resources, via static constructors.
+
+  // Store the address of the instance so that instance () doesn't
+  // allocate a new one when called.
+  instance_ = this;
 
   init ();
 }
 
 ACE_Object_Manager::~ACE_Object_Manager (void)
 {
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
   fini ();
 }
 
@@ -304,7 +282,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;
     }
@@ -575,16 +555,10 @@ 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)
 {
-  if (shutting_down_i ())
+  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;
@@ -592,13 +566,20 @@ ACE_Object_Manager::fini (void)
   // 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
+  // First, indicate that the ACE_Object_Manager instance is being
   // shut down.
   object_manager_state_ = OBJ_MAN_SHUTTING_DOWN;
 
+  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.
-  ACE_Cleanup_Info info;
   while (registered_objects_ &&
          registered_objects_->dequeue_head (info) != -1)
     {
@@ -609,72 +590,60 @@ ACE_Object_Manager::fini (void)
         (*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 */);
 
-      // 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
+  //
 
-      //
-      // 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 ();
 
-      // Unlink all services in the Service Repository and close/delete
-      // all ACE library services and singletons.
-      ACE_Service_Config::close ();
+  delete preallocations_;
+  preallocations_ = 0;
 
-      // Close the ACE_Allocator.
-      ACE_Allocator::close_singleton ();
+  // 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
+  // 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 arrays.
+  // (none)
 
-      // Cleanup the dynamically preallocated objects.
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_SYNCH_RW_MUTEX, ACE_FILECACHE_LOCK)
+  // 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)
+  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)
+    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)
 # endif /* ACE_MT_SAFE */
 #endif /* ! ACE_HAS_STATIC_PREALLOCATION */
 
 #if defined (ACE_HAS_THREADS)
-      ACE_Static_Object_Lock::cleanup_lock ();
+  ACE_Static_Object_Lock::cleanup_lock ();
 #endif /* ACE_HAS_THREADS */
-    }
 
   delete default_mask_;
   default_mask_ = 0;
@@ -696,20 +665,20 @@ ACE_Object_Manager::fini (void)
   singleton_recursive_lock_ = 0;
 #endif /* ACE_MT_SAFE */
 
-  // Indicate that this ACE_Object_Manager instance has been shut down.
+  // Indicate that the ACE_Object_Manager instance has been shut down.
   object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
   // Then, ensure that the ACE_OS_Object_Manager gets shut down.
-  if (this == instance_ && ACE_OS_Object_Manager::instance_)
+  if (ACE_OS_Object_Manager::instance_)
     ACE_OS_Object_Manager::instance_->fini ();
 
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
   if (dynamically_allocated_)
     {
-      delete this;
+      delete instance_;
+      instance_ = 0;
     }
-
-  if (this == instance_)
-    instance_ = 0;
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
   return 0;
 }
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 96bd39daf79..1dfc2cb20cc 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -256,7 +256,6 @@ public:
       ACE_THREAD_EXIT_LOCK,
       ACE_TOKEN_MANAGER_CREATION_LOCK,
       ACE_TOKEN_INVARIANTS_CREATION_LOCK,
-      ACE_PROACTOR_EVENT_LOOP_LOCK,
 #endif /* ACE_MT_SAFE */
 
       // Hook for preallocated objects provided by application.
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 6c3683ed4fb..f789eb9cdec 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -78,7 +78,6 @@ 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)
 {
@@ -237,6 +236,12 @@ ACE_POSIX_SIG_Asynch_Operation::~ACE_POSIX_SIG_Asynch_Operation (void)
 {
 }
 
+int
+ACE_POSIX_SIG_Asynch_Operation::register_aio_with_proactor (ACE_POSIX_Asynch_Result *result)
+{
+  return this->posix_proactor ()->register_aio_with_proactor (result);
+}
+
 // *********************************************************************
 
 u_long
@@ -534,13 +539,12 @@ ACE_POSIX_SIG_Asynch_Read_Stream::shared_read (ACE_POSIX_Asynch_Read_Stream_Resu
   // 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);
+  result->aio_sigevent.sigev_value.sival_ptr = (void *) result;
 
+  // Register the real-time signal with the Proactor. 
+  if (this->register_aio_with_proactor (result) == -1)
+    return -1;
+  
   // Fire off the aio read.
   if (aio_read (result) == -1)
     // Queueing failed.
@@ -867,13 +871,12 @@ ACE_POSIX_SIG_Asynch_Write_Stream::shared_write (ACE_POSIX_Asynch_Write_Stream_R
   // We want queuing of RT signal to notify completion.
   result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
   result->aio_sigevent.sigev_signo = result->signal_number ();
+  result->aio_sigevent.sigev_value.sival_ptr = (void *) result;
 
-  // 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);
-
+  // Register the real-time signal with the Proactor. 
+  if (this->register_aio_with_proactor (result) == -1)
+    return -1;
+  
   // Fire off the aio write.
   if (aio_write (result) == -1)
     // Queueing failed.
@@ -1725,12 +1728,12 @@ protected:
 
   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_;
+  ACE_Thread_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
@@ -1836,7 +1839,7 @@ 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);
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0);
 
   // Get the first item (result ptr) from the Queue.
   ACE_POSIX_Asynch_Accept_Result* result = 0;
@@ -1882,13 +1885,13 @@ ACE_POSIX_AIOCB_Asynch_Accept_Handler::register_accept_call (ACE_POSIX_Asynch_Ac
   // 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_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
 
   return register_accept_call_i (result);
 }
 
 int
-ACE_POSIX_AIOCB_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
+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
@@ -1949,17 +1952,18 @@ ACE_POSIX_SIG_Asynch_Accept_Handler::register_accept_call (ACE_POSIX_Asynch_Acce
   // 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_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
   
   // Do the work.
   if (this->register_accept_call_i (result) == -1)
     return -1;
-  
-  return 0;
+
+  // Also register the real-time signal.
+  return this->posix_proactor_->register_aio_with_proactor (result);
 }
 
 int
-ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
+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
@@ -2090,7 +2094,7 @@ ACE_POSIX_AIOCB_Asynch_Accept::open (ACE_Handler &handler,
   // 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_));
+                                                       (void *) &this->reactor_);
   if (return_val  == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%N:%l:Thread_Manager::spawn failed\n"),
@@ -2106,9 +2110,10 @@ ACE_POSIX_AIOCB_Asynch_Accept::~ACE_POSIX_AIOCB_Asynch_Accept (void)
 void*
 ACE_POSIX_AIOCB_Asynch_Accept::thread_function (void* arg_reactor)
 {
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept::thread_function called\n"));
+
   // Retrieve the reactor pointer from the argument.
-  ACE_Reactor* reactor = ACE_reinterpret_cast (ACE_Reactor *,
-                                               arg_reactor);
+  ACE_Reactor* reactor = (ACE_Reactor *) arg_reactor;
 
   // It should be valid Reactor, since we have a reactor_ ,e,ner we
   // are passing only that one here.
@@ -2125,7 +2130,13 @@ ACE_POSIX_AIOCB_Asynch_Accept::thread_function (void* arg_reactor)
   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;
 }
 
@@ -2251,8 +2262,7 @@ 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);
+  ACE_Reactor* reactor = (ACE_Reactor *) arg_reactor;
   if (reactor == 0)
     reactor = ACE_Reactor::instance ();
 
@@ -2466,9 +2476,7 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_Handler : public ACE_Handler
   // = 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.
+  //     <ACE_POSIX_Asynch_Transmit_File> in Unix systems.
 
 public:
   virtual ~ACE_POSIX_Asynch_Transmit_Handler (void);
@@ -2670,7 +2678,7 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::transmit (void)
   // 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_),
+                       (void *) &this->header_act_,
                        0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
@@ -2687,25 +2695,32 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_W
   // 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
+
+      // Check the success parameter.
+      if (result.success () == 0)
         {
-          // This is crucial to prevent memory leaks. This deletes
-          // the result pointer also.
-          delete this;
+          // 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.
@@ -2739,7 +2754,7 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_W
   // Not a partial write. A full write.
 
   // Check ACT to see what was sent.
-  ACT act = * (ACT *) result.act ();
+  ACT act = *(ACT *) result.act ();
 
   switch (act)
     {
@@ -2801,10 +2816,8 @@ ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read
   if (result.bytes_transferred () == 0)
     return;
 
-  // Increment offset.
+  // Increment offset and write data to network.
   this->file_offset_ += result.bytes_transferred ();
-
-  // Write data to network.
   if (this->ws_.write (result.message_block (),
                        result.bytes_transferred (),
                        (void *)&this->data_act_,
@@ -2905,8 +2918,7 @@ ACE_POSIX_SIG_Asynch_Transmit_Handler::transmit (void)
   // 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_),
+                       (void *) &this->header_act_,
                        this->result_->priority (),
                        this->result_->signal_number ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index 56224912845..521ecd31b45 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -172,6 +172,12 @@ protected:
   virtual ~ACE_POSIX_Asynch_Operation (void);
   // Destructor.
 
+  virtual int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result) = 0;
+  // <Asynch_Operation> class call this method to register the <aio_>
+  // call with the Proactor, so that Proactor can do completion
+  // querying effectively. Different POSIX Proactor implementations do
+  // different things to register the <aio_>. 
+  
   ACE_Proactor *proactor_;
   // Proactor that this Asynch IO will be registered with.
 
@@ -239,6 +245,12 @@ protected:
   virtual ~ACE_POSIX_SIG_Asynch_Operation (void);
   // Destructor.
 
+  int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result);
+  // <Asynch_Operation> classes call this, to register the real-time
+  // signal used to issue the <aio_> call with the Proator. This
+  // should be done so that the Proactor can wait for completions of
+  // the asynchronous calls, issued using those signals.
+
   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_*
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 68c8aaf7be0..3861e8aa110 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -13,38 +13,6 @@
 #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 ();
@@ -80,7 +48,7 @@ ACE_POSIX_Proactor::close_dispatch_threads (int)
 size_t
 ACE_POSIX_Proactor::number_of_threads (void) const
 {
-  // @@ Implement it.
+  // @@ Implement it. 
   ACE_NOTSUP_RETURN (0);
 }
 
@@ -139,7 +107,7 @@ ACE_POSIX_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
                                                         bytes_to_write,
                                                         act,
                                                         event,
-                                                        priority,
+                                                        priority, 
                                                         signal_number),
                   0);
   return implementation;
@@ -322,7 +290,7 @@ void
 ACE_POSIX_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_result,
                                                u_long bytes_transferred,
                                                int success,
-                                               const void */* completion_key*/,
+                                               const void *completion_key,
                                                u_long error)
 {
   ACE_SEH_TRY
@@ -330,7 +298,7 @@ ACE_POSIX_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_r
       // Call completion hook
       asynch_result->complete (bytes_transferred,
                                success,
-                               0, // No completion key.
+                               (void *) completion_key,
                                error);
     }
   ACE_SEH_FINALLY
@@ -340,23 +308,6 @@ ACE_POSIX_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_r
     }
 }
 
-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
@@ -378,7 +329,7 @@ class ACE_Export ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler
   //     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.
+  //     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
@@ -389,10 +340,10 @@ 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.
 
@@ -403,10 +354,10 @@ public:
 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.
+  // pipe. 
 
   ACE_Pipe pipe_;
   // Pipe for the communication between Proactor and the
@@ -459,8 +410,7 @@ 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),
+                              (char *) &result,
                               sizeof (result));
   if (return_val != sizeof (result))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -475,7 +425,7 @@ 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.
+  // pointer. 
   ACE_POSIX_Asynch_Result *asynch_result = 0;
   asynch_result = *(ACE_POSIX_Asynch_Result **) result.message_block ().rd_ptr ();
 
@@ -513,10 +463,7 @@ ACE_POSIX_AIOCB_Proactor::ACE_POSIX_AIOCB_Proactor (void)
 {
   // Initialize the array.
   for (size_t ai = 0; ai < this->aiocb_list_max_size_; ai++)
-    {
-      aiocb_list_[ai] = 0;
-      result_list_ [ai] = 0;
-    }
+    aiocb_list_[ai] = 0;
 
   // Accept Handler for aio_accept. Remember! this issues a Asynch_Read
   // on the notify pipe for doing the Asynch_Accept.
@@ -615,12 +562,10 @@ 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);
-    }
+    // Indefinite blocking.
+    result_suspend = aio_suspend (this->aiocb_list_,
+                                  this->aiocb_list_max_size_,
+                                  0);
   else
     {
       // Block on <aio_suspend> for <milli_seconds>
@@ -631,12 +576,12 @@ ACE_POSIX_AIOCB_Proactor::handle_events (unsigned long milli_seconds)
                                     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.
+      // return -1. 
       if (errno ==  EAGAIN)
         return 0;
       else
@@ -656,7 +601,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events (unsigned long milli_seconds)
       // Dont process null blocks.
       if (aiocb_list_ [ai] == 0)
         continue;
-
+      
       // Analyze error and return values.
 
       // Get the error status of the aio_ operation.
@@ -688,21 +633,17 @@ ACE_POSIX_AIOCB_Proactor::handle_events (unsigned long milli_seconds)
         // 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]);
+  ACE_POSIX_Asynch_Result *asynch_result =
+    (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.
@@ -711,7 +652,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events (unsigned long milli_seconds)
                                    1,             // Success
                                    0,             // No completion key.
                                    error_status); // Error
-
+  
   // Success
   return 1;
 }
@@ -769,9 +710,7 @@ ACE_POSIX_AIOCB_Proactor::register_aio_with_proactor (ACE_POSIX_Asynch_Result *r
                       -1);
 
   // Store the pointers.
-  this->aiocb_list_[ai] = result; 
-  this->result_list_ [ai] = result;
-
+  this->aiocb_list_[ai] = result;
   this->aiocb_list_cur_size_ ++;
 
   return 0;
@@ -781,80 +720,13 @@ ACE_POSIX_AIOCB_Proactor::register_aio_with_proactor (ACE_POSIX_Asynch_Result *r
 
 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.
+  // Make the sigset_t consisting of the completion signals.
   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)
 {
@@ -882,20 +754,23 @@ ACE_POSIX_SIG_Proactor::post_completion (ACE_POSIX_Asynch_Result *result)
   pid_t pid = ACE_OS::getpid ();
   if (pid == (pid_t) -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N:%l(%P | %t):%p",
-                       "<getpid> failed"),
+                       "Error:(%P | %t):%p",
+                       "<getpid> failed\n"),
                       -1);
-
+  
   // Set the signal information.
   sigval value;
-  value.sival_ptr = ACE_reinterpret_cast (void *,
-                                          result);
-
+  value.sival_ptr = (void *) result;
+  
+  // Register the signal number with the Proactor. 
+  if (this->register_aio_with_proactor (result) == -1)
+    return -1;
+  
   // 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"),
+                       "Error:(%P | %t):%p",
+                       "<sigqueue> failed\n"),
                       -1);
   return 0;
 }
@@ -950,131 +825,15 @@ ACE_POSIX_SIG_Proactor::create_asynch_transmit_file (void)
   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);
-    }
+    result_sigwait = sigwaitinfo (&this->RT_completion_signals_,
+                                  &sig_info);
   else
     {
       // Wait for <milli_seconds> amount of time.
@@ -1085,7 +844,7 @@ ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
                                      &sig_info,
                                      &timeout);
     }
-
+  
   // Check for errors
   if (result_sigwait == -1)
     {
@@ -1100,26 +859,38 @@ ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
                            "sigtimedwait/sigwaitinfo failed"),
                           -1);
     }
-
+  
   // No errors, RT compleion signal is received.
-
+  
+  // We deal only with the signal numbers that have been registered
+  // already. 
+  int member = sigismember (&this->RT_completion_signals_,
+                            result_sigwait); 
+  if (member != 1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%N:%l:(%P | %t)::%p\n",
+                       "ACE_POSIX_SIG_Proactor::handle_events:"
+                       "Unexpected signal (%d) received while waiting for RT Completion Signal",
+                       result_sigwait),
+                      -1);
+  
   // 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):"
+                       "%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);
+  ACE_POSIX_Asynch_Result *asynch_result =
+    (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.
+      // Analyze error and return values. 
 
       // Check the error status
       int error_status = aio_error (asynch_result);
@@ -1130,11 +901,11 @@ ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
                            "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.
@@ -1152,7 +923,7 @@ ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
           this->application_specific_code (asynch_result,
                                            return_status,
                                            1,             // Result : True.
-                                           0,             // No completion key.
+                                           0,             // No completion_signal.
                                            error_status); // Error.
         }
     }
@@ -1177,6 +948,58 @@ ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
   return 1;
 }
 
+int
+ACE_POSIX_SIG_Proactor::register_aio_with_proactor (ACE_POSIX_Asynch_Result *result)
+{
+  // Nothing to do if this signal is already there in the signal set,
+  // that has been already masked out.
+  int member = sigismember (&this->RT_completion_signals_,
+                            result->signal_number ());
+  if (member == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%N:%l:(%P | %t)::%p\n",
+                       "ACE_POSIX_SIG_Proactor::register_aio_with_proactor:"
+                       "sigismember failed"),
+                      -1);
+  // Return if it is already there.
+  if (member == 1)
+    return 0;
+  
+  // Add the signal number to the signal set.
+  if (sigaddset (&this->RT_completion_signals_, result->signal_number ()) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p\n",
+                       "Couldnt init the RT completion signal set"),
+                      -1);
+  
+  // Mask them.
+  if (sigprocmask (SIG_BLOCK, &RT_completion_signals_, 0) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p\n",
+                       "Couldnt mask the RT completion signals"),
+                      -1);
+ 
+  // 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 = 0;         // No handler function.
+  int sigaction_return = sigaction (result->signal_number (),
+                                    &reaction,
+                                    0);
+  if (sigaction_return == -1)
+    ACE_ERROR ((LM_ERROR,
+                "Error:%p\n",
+                "Proactor couldnt do sigaction for the RT SIGNAL"));
+  return 0;
+}
+
+
 // *********************************************************************
 
 ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer (ACE_Handler &handler,
@@ -1205,29 +1028,4 @@ ACE_POSIX_Asynch_Timer::complete (u_long 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
index ee3b4af9c01..889ff0c4234 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -92,18 +92,18 @@ public:
                                                                                 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);
+                                                                                ACE_HANDLE event,
+                                                                                int priority,
+                                                                                int signal_number);
 
   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);
+                                                                                  ACE_HANDLE event,
+                                                                                  int priority,
+                                                                                  int signal_number);
 
   virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
                                                                             ACE_HANDLE handle,
@@ -112,9 +112,9 @@ public:
                                                                             const void* act,
                                                                             u_long offset,
                                                                             u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN);
+                                                                            ACE_HANDLE event,
+                                                                            int priority,
+                                                                            int signal_number);
 
   virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
                                                                               ACE_HANDLE handle,
@@ -123,9 +123,9 @@ public:
                                                                               const void* act,
                                                                               u_long offset,
                                                                               u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN);
+                                                                              ACE_HANDLE event,
+                                                                              int priority,
+                                                                              int signal_number);
 
   virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
                                                                       ACE_HANDLE listen_handle,
@@ -133,9 +133,9 @@ public:
                                                                       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);
+                                                                      ACE_HANDLE event,
+                                                                      int priority,
+                                                                      int signal_number);
 
   virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
                                                                                     ACE_HANDLE socket,
@@ -147,16 +147,16 @@ public:
                                                                                     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);
+                                                                                    ACE_HANDLE event,
+                                                                                    int priority,
+                                                                                    int signal_number);
   
   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);
+                                                       ACE_HANDLE event,
+                                                       int priority,
+                                                       int signal_number);
   // Create a timer result object which can be used with the Timer
   // mechanism of the Proactor. 
   
@@ -170,20 +170,26 @@ protected:
 				  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>. 
+  // dispatching handles.
+
+  virtual int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result) = 0;
+  // <Asynch_Operation> class call this method to register the <aio_>
+  // call with the Proactor, so that Proactor can do completion
+  // querying. Different <POSIX_Proactor> implementations do different
+  // things to register the <aio_>. 
+
+#if 0
+  ACE_Thread_Manager thr_mgr_;
+  // This will manage the thread in the Timer_Handler.
+
+  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.
+#endif /* 0 */
 };
 
 // Forward declarations.
@@ -271,16 +277,13 @@ protected:
   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).
 
@@ -293,11 +296,8 @@ 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. 
+  //     POSIX Real Time signals. <sigtimedwait> call is used to get
+  //     the notify/get the completions.
   //
   // = DESCRIPTION
   //
@@ -309,15 +309,7 @@ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_Proactor
 
 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.
+  // Constructor.
 
   virtual ~ACE_POSIX_SIG_Proactor (void);
   // Destructor.
@@ -353,33 +345,18 @@ public:
 
   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.
 
+  int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result);
+  // <Asynch_Operation> classes call this, to register the real-time
+  // signal used to issue the <aio_> call with the Proator. This
+  // should be done so that the Proactor can wait for completions of
+  // the asynchronous calls, issued using those signals.
+
   sigset_t RT_completion_signals_;
   // These signals are used for completion notification by the
   // Proactor. The signals specified while issueing <Asynch
@@ -396,8 +373,7 @@ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result
   //     called. 
   
   friend class ACE_POSIX_Proactor;
-  friend class ACE_POSIX_SIG_Proactor;
-  // The factory method for this class is with the POSIX_Proactor 
+  // The factory method for this class is with the POSIX_Proactor
   // class. 
 
 protected:
@@ -406,7 +382,7 @@ protected:
                           const ACE_Time_Value &tv,
                           ACE_HANDLE event = ACE_INVALID_HANDLE,
                           int priority = 0,
-                          int signal_number = ACE_SIGRTMIN);
+                          int signal_number = SIGRTMIN);
   // Constructor.
   
   virtual ~ACE_POSIX_Asynch_Timer (void) {}
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index cda7c90ee05..da2bd33804d 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -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);
+      char *function_name = ACE_const_cast (char *, 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)
         {
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..c2cf0b4b0c1 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -34,9 +34,6 @@ 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
@@ -59,14 +56,9 @@ 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:
   virtual int svc (void);
   // Run by a daemon thread to handle deferred processing. In other
@@ -97,9 +89,6 @@ 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
@@ -107,28 +96,35 @@ ACE_Proactor_Timer_Handler::svc (void)
 {
   ACE_Time_Value absolute_time;
   int empty_flag = 0;
-  int result = 0;
-
+  
   while (this->shutting_down_ == 0)
     {
-      // Is the timer queue empty?
+      // If the timer queue is not 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);
+	  absolute_time =
+            this->proactor_.timer_queue ()->earliest_time () -
+            this->proactor_.timer_queue ()->gettimeofday ();
+          // #if 0
+          ACE_DEBUG ((LM_DEBUG,
+                      "%N%l:(%t):Earliest Time %d sec, %d msec time\n",
+                      absolute_time.sec (),
+                      absolute_time.msec ()));
+          // #endif
+          // Make it zero if it is negative.
+          if (absolute_time < ACE_Time_Value::zero)
+            absolute_time = ACE_Time_Value::zero;
         }
+
+      // Wait for event upto <absolute_time>.
+      int result = 0;
+      if (empty_flag)
+        result = this->timer_event_.wait (0);
       else
-        {
-          // Wait for ever.
-          result = this->timer_event_.wait ();
-        }
+        result = this->timer_event_.wait (&absolute_time);
       
-      // Check for timer expiries.
       if (result == -1)
         {
           switch (errno)
@@ -146,6 +142,7 @@ ACE_Proactor_Timer_Handler::svc (void)
             }
         }
     }
+
   return 0;
 }
 
@@ -169,21 +166,19 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue,
                        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);
+                                                                                 act,
+                                                                                 time,
+                                                                                 0);
   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);
-  
+
   // Post a completion.
   if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -235,8 +230,8 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor)
 // *********************************************************************
 
 ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
-                            int delete_implementation,
-                            TIMER_QUEUE *tq)
+                            TIMER_QUEUE *tq,
+                            int delete_implementation)
   : implementation_ (0),
     delete_implementation_ (delete_implementation),
     timer_handler_ (0),
@@ -244,7 +239,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
     delete_timer_queue_ (0)
 {
   this->implementation (implementation);
-  
+
   if (this->implementation () == 0)
     {
 #if defined (ACE_HAS_AIO_CALLS)
@@ -253,8 +248,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
       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);
+  #else /* Default is to use the AIOCB one */
+      ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
   #endif
 #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
       // WIN_Proactor.
@@ -284,7 +279,7 @@ ACE_Proactor::~ACE_Proactor (void)
 }
 
 ACE_Proactor *
-ACE_Proactor::instance (size_t /* threads */)
+ACE_Proactor::instance (size_t threads)
 {
   ACE_TRACE ("ACE_Proactor::instance");
 
@@ -342,60 +337,20 @@ 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 */
-
-  // 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)
+  ACE_TRACE ("ACE_Proactor::run_event_loop");
+
+  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 ();
-      
+
       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;
+  return 0;
 }
 
 // Handle events for -tv- time.  handle_events updates -tv- to reflect
@@ -405,93 +360,29 @@ 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 ();
-      
+
       // 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;
+  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;
 }
 
 int
@@ -517,15 +408,15 @@ ACE_Proactor::close (void)
       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_;
@@ -577,10 +468,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
     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_Recursive_Thread_Mutex, ace_mon, this->timer_queue_->mutex (), -1);
 
   // Schedule the timer
   long result = this->timer_queue_->schedule (&handler,
@@ -749,8 +637,7 @@ ACE_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
                                                 u_long bytes_to_read,
                                                 const void* act,
                                                 ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
+                                                int priority)
 {
   return this->implementation ()->create_asynch_read_stream_result (handler,
                                                                     handle,
@@ -758,8 +645,7 @@ ACE_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
                                                                     bytes_to_read,
                                                                     act,
                                                                     event,
-                                                                    priority,
-                                                                    signal_number);
+                                                                    priority);
 }
 
 
@@ -770,8 +656,7 @@ ACE_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
                                                  u_long bytes_to_write,
                                                  const void* act,
                                                  ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
+                                                 int priority)
 
 {
   return this->implementation ()->create_asynch_write_stream_result (handler,
@@ -780,8 +665,7 @@ ACE_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
                                                                      bytes_to_write,
                                                                      act,
                                                                      event,
-                                                                     priority,
-                                                                     signal_number);
+                                                                     priority);
 }
 
 
@@ -795,8 +679,7 @@ ACE_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
                                               u_long offset,
                                               u_long offset_high,
                                               ACE_HANDLE event,
-                                              int priority,
-                                              int signal_number)
+                                              int priority)
 
 {
   return this->implementation ()->create_asynch_read_file_result (handler,
@@ -807,8 +690,7 @@ ACE_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
                                                                   offset,
                                                                   offset_high,
                                                                   event,
-                                                                  priority,
-                                                                  signal_number);
+                                                                  priority);
 }
 
 
@@ -822,8 +704,7 @@ ACE_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
                                                u_long offset,
                                                u_long offset_high,
                                                ACE_HANDLE event,
-                                               int priority,
-                                               int signal_number)
+                                               int priority)
 
 {
   return this->implementation ()->create_asynch_write_file_result (handler,
@@ -834,8 +715,7 @@ ACE_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
                                                                    offset,
                                                                    offset_high,
                                                                    event,
-                                                                   priority,
-                                                                   signal_number);
+                                                                   priority);
 }
 
 
@@ -847,8 +727,7 @@ ACE_Proactor::create_asynch_accept_result (ACE_Handler &handler,
                                            u_long bytes_to_read,
                                            const void* act,
                                            ACE_HANDLE event,
-                                           int priority,
-                                           int signal_number)
+                                           int priority)
 
 {
   return this->implementation ()->create_asynch_accept_result (handler,
@@ -858,8 +737,7 @@ ACE_Proactor::create_asynch_accept_result (ACE_Handler &handler,
                                                                bytes_to_read,
                                                                act,
                                                                event,
-                                                               priority,
-                                                               signal_number);
+                                                               priority);
 }
 
 ACE_Asynch_Transmit_File_Result_Impl *
@@ -874,8 +752,7 @@ ACE_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
                                                   u_long flags,
                                                   const void *act,
                                                   ACE_HANDLE event,
-                                                  int priority,
-                                                  int signal_number)
+                                                  int priority)
 
 {
   return this->implementation ()->create_asynch_transmit_file_result (handler,
@@ -889,8 +766,7 @@ ACE_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
                                                                       flags,
                                                                       act,
                                                                       event,
-                                                                      priority,
-                                                                      signal_number);
+                                                                      priority);
 }
 
 ACE_Asynch_Result_Impl *
@@ -898,21 +774,13 @@ ACE_Proactor::create_asynch_timer (ACE_Handler &handler,
                                    const void *act,
                                    const ACE_Time_Value &tv,
                                    ACE_HANDLE event,
-                                   int priority,
-                                   int signal_number)
+                                   int priority)
 {
   return this->implementation ()->create_asynch_timer (handler,
                                                        act,
                                                        tv,
                                                        event,
-                                                       priority,
-                                                       signal_number);
-}
-
-int
-ACE_Proactor::post_wakeup_completions (int how_many)
-{
-  return ACE_Proactor::instance ()->implementation ()->post_wakeup_completions (how_many);
+                                                       priority);
 }
 
 void
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 7c08bfac14b..4aea6e847eb 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -143,12 +143,9 @@ public:
   // 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.
+                TIMER_QUEUE *tq = 0,
+                int delete_implementation = 0);
+  // A do nothing constructor.
 
   virtual ~ACE_Proactor (void);
   // Virtual destruction.
@@ -177,9 +174,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.
@@ -306,9 +301,8 @@ public:
                                                                                 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);
+                                                                                ACE_HANDLE event,
+                                                                                int priority);
   // 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,
@@ -316,9 +310,8 @@ public:
                                                                                   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);
+                                                                                  ACE_HANDLE event,
+                                                                                  int priority);
   // 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,
@@ -328,9 +321,8 @@ public:
                                                                             const void* act,
                                                                             u_long offset,
                                                                             u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN);
+                                                                            ACE_HANDLE event,
+                                                                            int priority);
   // 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,
@@ -340,9 +332,8 @@ public:
                                                                               const void* act,
                                                                               u_long offset,
                                                                               u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN);
+                                                                              ACE_HANDLE event,
+                                                                              int priority);
   // Create the correct implementation class for ACE_Asynch_Write_File::Result.
 
   virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
@@ -351,9 +342,8 @@ public:
                                                                       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);
+                                                                      ACE_HANDLE event,
+                                                                      int priority);
   // 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,
@@ -366,30 +356,19 @@ public:
                                                                                     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);
+                                                                                    ACE_HANDLE event,
+                                                                                    int priority);
   // 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);
+                                                       ACE_HANDLE event,
+                                                       int priority = 0);
   // 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.
+  // mechanism of the Proactor.
 
 protected:
-
-  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>. 
-
   virtual void implementation (ACE_Proactor_Impl *implementation);
   // Set the implementation class.
 
@@ -422,9 +401,6 @@ protected:
   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 &);
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index 16d5b65d08f..347de43fcd7 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -85,7 +85,7 @@ public:
   // methods.
 
   virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void) = 0;
-  // Create the correct implementation class for doing Asynch_Read_Stream. 
+    // 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. 
@@ -113,7 +113,7 @@ public:
                                                                                 ACE_Message_Block &message_block,
                                                                                 u_long bytes_to_read,
                                                                                 const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                                ACE_HANDLE event,
                                                                                 int priority = 0,
                                                                                 int signal_number = ACE_SIGRTMIN) = 0;
   // Create the correct implementation class for ACE_Asynch_Read_Stream::Result class. 
@@ -123,7 +123,7 @@ public:
                                                                                   ACE_Message_Block &message_block,
                                                                                   u_long bytes_to_write,
                                                                                   const void* act,
-                                                                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                                  ACE_HANDLE event,
                                                                                   int priority = 0,
                                                                                   int signal_number = ACE_SIGRTMIN) = 0;
   // Create the correct implementation class for ACE_Asynch_Write_Stream::Result.
@@ -135,7 +135,7 @@ public:
                                                                             const void* act,
                                                                             u_long offset,
                                                                             u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                            ACE_HANDLE event,
                                                                             int priority = 0,
                                                                             int signal_number = ACE_SIGRTMIN) = 0;
   // Create the correct implementation class for ACE_Asynch_Read_File::Result.  
@@ -147,7 +147,7 @@ public:
                                                                               const void* act,
                                                                               u_long offset,
                                                                               u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                              ACE_HANDLE event,
                                                                               int priority = 0,
                                                                               int signal_number = ACE_SIGRTMIN) = 0;
     // Create the correct implementation class for ACE_Asynch_Write_File::Result.
@@ -158,7 +158,7 @@ public:
                                                                       ACE_Message_Block &message_block,
                                                                       u_long bytes_to_read,
                                                                       const void* act,
-                                                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                      ACE_HANDLE event,
                                                                       int priority = 0,
                                                                       int signal_number = ACE_SIGRTMIN) = 0;
   // Create the correct implementation class for ACE_Asynch_Accept::Result.
@@ -173,7 +173,7 @@ public:
                                                                                     u_long bytes_per_send,
                                                                                     u_long flags,
                                                                                     const void *act,
-                                                                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                                                                    ACE_HANDLE event,
                                                                                     int priority = 0,
                                                                                     int signal_number = ACE_SIGRTMIN) = 0;
   // Create the correct implementation class for ACE_Asynch_Transmit_File::Result.
@@ -181,17 +181,10 @@ public:
   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,
+                                                       ACE_HANDLE event,
                                                        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>. 
+                                                       int signal_number = ACE_SIGRTMIN) = 0;
+  // Create the correct implementation object for the Timer result.
 };
 
 #endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
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..c99f9282c96 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -268,18 +268,8 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
 
   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;
 }
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..938fbacef09 100644
--- a/ace/README
+++ b/ace/README
@@ -300,7 +300,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,13 +313,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
@@ -407,6 +403,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 +648,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 +721,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 +732,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)
@@ -820,7 +822,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 +840,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
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.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.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/SString.h b/ace/SString.h
index b7fe755c629..3b2246091b6 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.  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.
 public:
   static const int npos;
   // No position constant
@@ -193,130 +192,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 +311,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 +458,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 +589,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..46b33d7541d 100644
--- a/ace/SString.i
+++ b/ace/SString.i
@@ -10,7 +10,7 @@ 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");
@@ -684,69 +684,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..e1da20664e9 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -24,6 +24,11 @@
 #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
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index 3bf4e4ac8cf..49253ee4bfe 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().
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.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.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_Object.i b/ace/Service_Object.i
index 1b15899cc49..7dea95999e2 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.i
@@ -60,7 +60,7 @@ 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 */
 }
 
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 43711da3b7d..0db2df28a47 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -209,15 +209,13 @@ 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 = this->service_vector_[i];
+      if ((*srp)->fini_called ())
         {
-          if (srp != 0)
-            *srp = 0;
+          *srp = 0;
           return -1;
         }
-
-      if (srp != 0)
-	*srp = this->service_vector_[i];
       if (ignore_suspended
           && this->service_vector_[i]->active () == 0)
 	return -2;
diff --git a/ace/Synch.h b/ace/Synch.h
index a15155352d1..21415ad495a 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -1577,9 +1577,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_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..c2ea6468e77 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
 {
diff --git a/ace/Synch_T.i b/ace/Synch_T.i
index 52445c8750b..c4e1b9d8d06 100644
--- a/ace/Synch_T.i
+++ b/ace/Synch_T.i
@@ -161,69 +161,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.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..cf9f319bd2e 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -142,8 +142,7 @@ open_new_endpoint (ACE_HANDLE listen_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)
+                                      "tirdwr") == ACE_INVALID_HANDLE)
     fd = ACE_INVALID_HANDLE;
 #endif /* I_PUSH */
 
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..c4c9c33e4a8 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -56,7 +56,7 @@ 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;
@@ -80,12 +80,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
 #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 ();
+	      localaddr->addr.buf = (char *) local_sap.get_addr ();
 
 	      if (ACE_OS::t_bind (new_stream.get_handle (),
                                   localaddr,
@@ -117,12 +114,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 +124,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.
     {
@@ -170,7 +159,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
       if (new_stream.get_rwflag ())
 	result = ACE_OS::ioctl (new_stream.get_handle (),
                                 I_PUSH,
-                                ACE_const_cast (char *, "tirdwr"));
+                                "tirdwr");
 #endif /* I_PUSH */
     }
   else if (!(errno == EWOULDBLOCK || errno == ETIME))
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/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 72d461b9a7c..75f8648f7ff 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -2029,8 +2029,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,7 +2057,7 @@ 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.
+// 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[],
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 2b43724a0bc..e203e068d35 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -498,19 +498,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 +595,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);
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/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..e6f141cf378 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 4
 #define ACE_MINOR_VERSION 6
-#define ACE_BETA_VERSION 40
-#define ACE_VERSION "4.6.40"
+#define ACE_BETA_VERSION 36
+#define ACE_VERSION "4.6.36"
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index fc87933c28b..e67e3bef3e6 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -16,38 +16,6 @@
 #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),
@@ -494,30 +462,13 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
                                     ) == FALSE)
     {
       delete result;
-      ACE_ERROR_RETURN ((LM_ERROR, "PostQueuedCompletionStatus failed\n"), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "Failure in dealing with timers: 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;
@@ -562,7 +513,7 @@ ACE_WIN32_Asynch_Timer::complete (u_long bytes_transferred,
                                   const void *completion_key,
                                   u_long error)
 {
-  ACE_UNUSED_ARG (error);
+    ACE_UNUSED_ARG (error);
   ACE_UNUSED_ARG (completion_key);
   ACE_UNUSED_ARG (success);
   ACE_UNUSED_ARG (bytes_transferred);
@@ -570,29 +521,4 @@ ACE_WIN32_Asynch_Timer::complete (u_long 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
index cc7dec6e120..f46999dbf9e 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -201,10 +201,6 @@ protected:
   // 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
@@ -221,10 +217,6 @@ protected:
   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
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_dll.dsp b/ace/ace_dll.dsp
index 71e4639265c..d880eaa61b7 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -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 ""

+CPP=cl.exe

+# 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 /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

 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 ""

+CPP=cl.exe

+# 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 /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 CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 RSC=rc.exe

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

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

@@ -235,12 +239,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

+# 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 /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

 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 ""

+CPP=cl.exe

+# 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 /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 CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 RSC=rc.exe

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

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

@@ -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,8 +1074,310 @@ SOURCE=.\Asynch_IO.cpp
 

 !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 +1422,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 +1872,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 +2029,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 +2230,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 +2325,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 +2420,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 +2527,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 +2626,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 +2741,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 +2852,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 +2883,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 +2976,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 +3101,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 +3230,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 +3429,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 +3618,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 +3717,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 +3816,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 +3919,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 +4026,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 +4129,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 +4236,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 +4343,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 +4442,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 +4557,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 +4668,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 +4879,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 +4980,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 +5101,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 +5196,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 +5337,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 +5502,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 +5624,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 +5719,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 +5830,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 +5925,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 +6188,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 +6395,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 +6602,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 +6693,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 +6800,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 +6937,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 +7056,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 +7193,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 +7308,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 +7435,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 +7615,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 +7710,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 +7867,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 +8060,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 +8321,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 +8414,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 +8679,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 +8972,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 +9199,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 +9294,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 +9523,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 +9796,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 +10083,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 +10336,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 +10497,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 +10811,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 +11098,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 +11227,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 +11462,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 +11779,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 +11944,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 +12071,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 +12277,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 +12584,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 +12777,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 +12936,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 +13171,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 +13402,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 +13649,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 +13744,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 +13975,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 +14202,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 +14571,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 +14870,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 +15001,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 +15136,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 +15427,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 +15520,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 +15621,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 +15722,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 +15817,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 +15974,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 +16077,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 +16226,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 +16337,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 +16462,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 +16601,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 +16716,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 +16831,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 +16942,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 +17057,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 +17164,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 +17305,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 +17404,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 +17519,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 +17630,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 +17819,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 +17980,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 +18241,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 +18336,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 +18435,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 +18534,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 +18629,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 +18724,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 +18927,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 +19232,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 +19529,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 +19648,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 +19743,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 +19902,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 +20185,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 +20280,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 +20451,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 +20546,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 +20721,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 +20902,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 +21085,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 +21268,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 +21451,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 +21738,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 +21911,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 +22014,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 +22131,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 +22250,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 +22361,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 +22484,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 +22691,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 +22898,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 +23105,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 +23314,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 +23549,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 +23642,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 +23759,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 +23854,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 +23963,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 +24062,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 +24385,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 +24706,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,8 +25019,252 @@ SOURCE=.\WFMO_Reactor.cpp
 

 !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"

 

+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"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -4033,8 +25332,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"

@@ -5734,11 +27277,6 @@ SOURCE=.\Pair_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RB_Tree.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Select_Reactor_T.cpp

 

 !IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 7932b4fed75..40a8180e47b 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 /D "_DEBUG" /D "_WINDOWS" /FD /I "..\\ /D " WIN32" /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /D "_DEBUG" /D "_WINDOWS" /FD /I /MTd "..\\ /D " WIN32" /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 /D "NDEBUG" /D "_WINDOWS" /FD /I "..\\ /D " WIN32" /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /FD /I "..\\ /D " WIN32" /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 /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I "..\\ /D " WIN32" /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I /MTd "..\\ /D " WIN32" /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 /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I "..\\ /D " WIN32" /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I "..\\ /D " WIN32" /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -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,6 +707,157 @@ SOURCE=.\Asynch_IO.cpp
 

 !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"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -438,28 +904,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 +1133,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 +1223,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 +1335,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 +1394,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 +1453,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 +1518,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 +1579,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 +1648,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 +1715,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 +1742,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 +1800,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 +1874,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 +1950,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 +2061,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 +2167,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 +2228,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 +2289,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 +2352,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 +2417,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 +2480,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 +2545,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 +2610,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 +2671,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 +2740,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 +2807,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 +2924,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 +2996,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 +3055,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 +3114,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 +3230,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 +3324,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 +3408,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 +3467,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 +3534,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 +3593,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 +3736,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 +3851,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 +3966,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 +4023,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 +4088,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 +4168,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 +4239,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 +4319,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 +4388,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 +4463,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 +4576,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 +4635,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 +4725,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 +4837,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 +4979,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 +5037,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 +5195,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 +5320,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 +5379,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 +5505,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 +5653,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 +5808,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 +5946,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 +6038,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 +6218,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 +6373,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 +6449,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 +6578,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 +6748,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 +6842,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 +6917,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 +6979,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 +7144,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 +7252,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 +7343,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 +7472,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 +7599,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 +7734,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 +7793,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 +7920,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 +8045,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 +8241,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 +8402,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 +8479,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 +8558,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 +8715,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 +8773,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 +8835,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 +8897,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 +8956,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 +9046,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 +9109,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 +9195,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 +9262,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 +9336,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 +9417,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 +9486,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 +9555,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 +9622,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 +9691,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 +9756,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 +9838,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 +9899,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 +9968,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 +10035,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 +10141,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 +10233,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 +10375,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 +10434,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 +10495,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 +10556,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 +10615,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 +10674,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 +10787,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 +10951,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 +11111,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 +11182,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 +11241,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 +11332,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 +11485,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 +11544,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 +11641,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 +11700,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 +11799,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 +11901,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 +12004,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 +12107,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 +12210,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 +12365,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 +12463,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 +12526,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 +12596,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 +12667,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 +12734,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 +12807,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 +12922,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 +13037,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 +13152,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 +13268,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 +13397,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 +13455,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 +13525,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 +13584,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 +13650,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 +13711,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 +13884,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,6 +14056,151 @@ SOURCE=.\UPIPE_Stream.cpp
 

 !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"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3881,6 +14224,128 @@ SOURCE=.\WFMO_Reactor.cpp
 

 !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"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3950,6 +14415,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"

@@ -5411,31 +15998,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,31 +16044,6 @@ SOURCE=.\Malloc_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Object.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=.\Map_Manager.cpp

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

@@ -5572,11 +16109,6 @@ SOURCE=.\Pair_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RB_Tree.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Select_Reactor_T.cpp

 

 !IF  "$(CFG)" == "ACE static library - Win32 Debug"

diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index dd18973d49b..77cf115a16a 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -91,7 +91,6 @@
 #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)
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..2c40cd94033 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
 
@@ -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-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..8653b39c4d0 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -81,9 +81,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++.h b/ace/config-irix6.x-sgic++.h
index 5b3306a657a..e214a68e775 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
 
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..bf5d89def69 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -71,11 +71,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
@@ -147,6 +146,7 @@
 #define ACE_LACKS_STRRECVFD
 
 //#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..5995b9c8dd8 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -40,12 +40,14 @@
 // ... and the final standard even!
 #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
 #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)
+#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
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index e4f49fae775..626eb2c2f7e 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
@@ -201,12 +199,6 @@ extern "C"
 // 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
+// AIOCB Proactor doesnt work on lynx yet.
+#define ACE_POSIX_SIG_PROACTOR
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-minimal.h b/ace/config-minimal.h
index d3e262040fd..6d132b08f62 100644
--- a/ace/config-minimal.h
+++ b/ace/config-minimal.h
@@ -13,6 +13,10 @@
 #define ACE_MAIN_OBJECT_MANAGER \
   ACE_OS_Object_Manager ace_os_object_manager;
 
+#if defined (ACE_HAS_TSS_EMULATION)
+# undef ACE_HAS_TSS_EMULATION
+#endif /* ACE_HAS_TSS_EMULATION */
+
 #if !defined(ACE_USE_THREAD_MANAGER_ADAPTER)
   // To prevent use of ACE_Thread_Exit functions in
   // ACE_Thread_Adapter::invoke ().
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index d22c688e02f..056309dc978 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
@@ -85,12 +82,11 @@
 # define ACE_HAS_BROKEN_R_ROUTINES
 # 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 +134,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
index 77aa346c9b7..471057cb665 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -238,8 +238,6 @@
 
 #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
index 551d99cbda5..3fa446b5094 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -140,8 +140,8 @@
 #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_LACKS_SIGSET //sandass
+#define ACE_LACKS_SIGACTION //sandass
 
 #define ACE_HAS_SIGWAIT
 
@@ -238,8 +238,7 @@
 
 #define ACE_LACKS_MKFIFO
 
-#define ACE_PSOS_DIAB
-
+//sandass
 #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..c4cc6d9a04e 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -227,8 +227,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-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..b25a5365bdc 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -30,10 +30,8 @@
 #   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
 # 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..b0bf1c07223 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -24,10 +24,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..cfd3d70cc70 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -28,29 +28,7 @@
 # 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-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..e73247fdaa5 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 */
@@ -83,7 +83,6 @@
 #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
@@ -104,6 +103,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 +123,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 +144,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..1519f7f50ab 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -284,6 +284,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 +297,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)
@@ -333,8 +333,8 @@ typedef unsigned __int64 ACE_UINT64;
                 // 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>
+        #include <windows.h>
+        #include <wce.h>
 #endif
 
 #if !defined (_INC_WINDOWS)     /* Already include windows.h ? */
diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp
index 518d5172992..8d290724a8f 100644
--- a/ace/gethrtime.cpp
+++ b/ace/gethrtime.cpp
@@ -29,11 +29,10 @@ ACE_gethrtime (void)
   // "now".  The A constraint signifies a 64-bit int.
 #if defined (__GNUG__)
   asm volatile ("rdtsc" : "=A" (now) : : "memory");
-// #elif defined (ghs)
-// The following doesn't work.  For now, this file must be compile with g++.
-//  asm ("rdtsc");
-//  asm ("movl %edx,-16(%ebp)");
-//  asm ("movl %eax,-12(%ebp)");
+#elif defined (ghs)
+  asm ("rdtsc");
+  asm ("movl -16(%ebp),%edx");
+  asm ("movl -12(%ebp),%eax");
 #else
 # error unsupported compiler
 #endif
diff --git a/apps/Gateway/Gateway/Channel.cpp b/apps/Gateway/Gateway/Channel.cpp
deleted file mode 100644
index 99699a6ee87..00000000000
--- a/apps/Gateway/Gateway/Channel.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-// $Id$
-
-#include "Routing_Entry.h"
-#include "Channel_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MUTEX
-
-// = The total number of bytes sent/received on this channel.
-size_t 
-Channel::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-Channel::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-Channel::Channel (ROUTING_TABLE *rt,
-                  Channel_Connector *cc,
-		  ACE_Thread_Manager *thr_mgr,
-		  int socket_queue_size)
-  : ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH> (thr_mgr),
-    routing_table_ (rt),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (Channel::IDLE),
-    connector_ (cc),
-    timeout_ (1),
-    max_timeout_ (Channel::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-Channel::active (int a)
-{
-  this->state (a == 0 ? Channel::IDLE : Channel::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-Channel::active (void)
-{
-  return this->state () == Channel::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-Channel::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-Channel::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-Channel::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-Channel::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-Channel::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-Channel::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-Channel::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect Channel %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-Channel::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of Channel %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, 
-						   this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the Channel object.
-
-int
-Channel::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down Channel %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-Channel::state (Channel::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-Channel::initialize_connection (void)
-{
-  this->state_ = Channel::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_ROUTING_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), -1);
-#endif /* ASSIGN_ROUTING_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-Channel::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'I' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific Channel.
-
-int
-Channel::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Channel's fd = %d\n", this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-Channel::State
-Channel::state (void)
-{
-  return this->state_;
-}
-
-void
-Channel::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-Channel::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-Channel::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-Channel::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-Channel::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the routing table pointer.
-
-Output_Channel::Output_Channel (ROUTING_TABLE *rt,
-                                Channel_Connector *cc,
-				ACE_Thread_Manager *thr_mgr,
-				int socket_queue_size)
-  : Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'O';
-  this->msg_queue ()->high_water_mark (Output_Channel::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the Channel as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Output_Channel::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (Channel::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-int 
-Output_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Output_Channel!\n"), -1);
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-queued at the *front* of
-// the Message_List.
-
-int
-Output_Channel::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (Channel::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-int
-Output_Channel::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;    
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the buffer.
-      // Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending a message when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Output_Channel::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  int           status = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) in handle_output on handle %d\n", this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire message (or we did not fail
-          // due to EWOULDBLOCK) then check if there are more messages on the Message_List.
-          // If there aren't, tell the ACE_Reactor not to notify us anymore (at least
-          // until there are new messages queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may queue if necessary).
-
-int 
-Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control 
-    // then just enqueue and return.
-    return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the routing table pointer and the connector pointer.
-
-Input_Channel::Input_Channel (ROUTING_TABLE *rt,
-                              Channel_Connector *cc,
-			      ACE_Thread_Manager *thr_mgr,
-			      int socket_queue_size)
-  : msg_frag_ (0), 
-    Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'I';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-int 
-Input_Channel::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) put should not be called on Input_Channel!\n"), -1);
-}
-
-int 
-Input_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Input_Channel!\n"), -1);
-}
-
-// Receive a Peer message from peerd.  Handles fragmentation.
-//
-// The routing message returned from recv_peer consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the message structure.
-
-int
-Input_Channel::recv_peer (ACE_Message_Block *&route_addr)
-{ 
-  Peer_Message *peer_msg;
-  size_t len;
-  ssize_t n = 0;
-  ssize_t m = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Peer_Message)), 
-		    -1);
-
-  peer_msg = (Peer_Message *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Peer_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, "attempted to read %d\n", header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire message.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof peer_msg->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  // Try to receive the remainder of the message
-
-  switch (m = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole message.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the message.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the message.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate a routing message header and chain the data portion 
-          // onto its continuation field.
-          ACE_NEW_RETURN (route_addr,
-			  ACE_Message_Block (sizeof (Peer_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Peer_Addr peer_addr (this->id (), peer_msg->header_.routing_id_, 0);
-          // Copy the routing address from the Peer_Message into routing_addr.
-          route_addr->copy ((char *) &peer_addr, sizeof (Peer_Addr));
-
-          // Reset the pointer to indicate we've got an entire message.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 peer_addr.conn_id_, peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		 peer_msg->header_.len_, peer_msg->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 peer_msg->header_.routing_id_, peer_msg->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the 
-// gatewayd, as well as stdio).
-
-int 
-Input_Channel::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *route_addr = 0;
-
-  switch (this->recv_peer (route_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (Channel::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input Channel %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (Channel::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input Channel %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->route_message (route_addr);
-    }
-}
-
-// Route a message to its appropriate destination.
-
-int
-Input_Channel::route_message (ACE_Message_Block *route_addr)
-{
-  // We got a valid message, so determine its virtual routing id,
-  // which is stored in the first of the two message blocks chained together.
-	
-  Peer_Addr *routing_key = (Peer_Addr *) route_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = route_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Routing_Entry *re = 0;
-	
-  if (this->routing_table_->find (*routing_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this message currently\n"));
-	    
-      else		// There are destinations, so forward the message.
-	{
-	  Routing_Entry::ENTRY_SET *esp = re->destinations ();
-	  Routing_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (Channel **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the message portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping messages"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete route_addr;
-	  return 0;
-	}
-    }
-  delete route_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     routing_key->conn_id_, routing_key->logical_id_, routing_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Iterator<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Entry<Peer_Addr, Routing_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Channel.h b/apps/Gateway/Gateway/Channel.h
deleted file mode 100644
index 339716bc55a..00000000000
--- a/apps/Gateway/Gateway/Channel.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL)
-#define _CHANNEL
-
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Routing_Table.h"
-#include "Routing_Entry.h"
-#include "Peer_Message.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MUTEX;
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#else /* ACE_HAS_THREADS */
-
-// Select communication mechanisms.
-#if 0 // defined (ACE_HAS_TLI)
-// Note that due to inconsistencies between the semantics of sockets
-// and TLI with respect to establishing non-blocking connections it's
-// not a good idea to use TLI...
-#include "ace/TLI_Connector.h"
-#define CHANNEL_PEER_STREAM ACE_TLI_STREAM
-#define CHANNEL_PEER_CONNECTOR ACE_TLI_CONNECTOR 
-#else
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#endif /* 0 */
-
-// Note that we only need to make the ACE_Task thread-safe if we
-// are using the multi-threaded Thr_Output_Channel...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH ACE_MT_SYNCH
-#else
-#define SYNCH ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Input_Channel...
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MUTEX;
-#else
-typedef ACE_Null_Mutex MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// Typedef for the routing table.
-typedef Routing_Table<Peer_Addr, Routing_Entry, MUTEX>
-	ROUTING_TABLE;
-
-// Forward declaration.
-class Channel_Connector;
-
-class Channel : public ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>
-  // = TITLE
-  //    Channel contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The Channel classes process messages sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. Channel_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, Channel_Connector
-  //    creates an Channel object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Channels are used by gatewayd
-  //    that to receive, route, and forward messages from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  Channel (ROUTING_TABLE *, 
-	   Channel_Connector *, 
-	   ACE_Thread_Manager * = 0,
-	   int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded Channel (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the Channel.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // Channel is established and active.
-    DISCONNECTING, // Channel is in the process of connecting.
-    FAILED	   // Channel has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get Channel activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based Channel reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform Channel termination.
-
-  ROUTING_TABLE *routing_table_;
-  // Pointer to table that maps a Peer_Addr
-  // to a Set of Channel *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  Channel_Connector *connector_;
-  // Back pointer to Channel_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Input_Channel : public Channel
-  // = TITLE
-  //     Handle reception of Peer messages arriving as events.
-{
-public:
-  Input_Channel (ROUTING_TABLE *, 
-		 Channel_Connector *, 
-		 ACE_Thread_Manager * = 0,
-		 int socket_queue_size = 0);
-  // Constructor sets the routing table pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer messages.
-
-protected:
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive a message from a peer.
-
-  int route_message (ACE_Message_Block *);
-  // Action that receives messages from peerd.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from
-  // peers.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-
-private:
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
-  // This methods should not be called to handle input.
-};
-
-class Output_Channel : public Channel
-  // = TITLE
-  //     Handle transmission of messages to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Output_Channel (ROUTING_TABLE *, 
-		  Channel_Connector *, 
-		  ACE_Thread_Manager * = 0,
-		  int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from peer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-};
-
-#endif /* _CHANNEL */
diff --git a/apps/Gateway/Gateway/Channel_Connector.cpp b/apps/Gateway/Gateway/Channel_Connector.cpp
deleted file mode 100644
index a5394e8b013..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "Channel_Connector.h"
-// $Id$
-
-
-Channel_Connector::Channel_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-Channel_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  Channel *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the Channel.
-
-int
-Channel_Connector::initiate_connection (Channel *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (Channel::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (Channel::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (Channel::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (Channel::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/Channel_Connector.h b/apps/Gateway/Gateway/Channel_Connector.h
deleted file mode 100644
index 3e27f37355a..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL_CONNECTOR)
-#define _CHANNEL_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_Channel.h"
-
-class Channel_Connector : public ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new Channel object to do the dirty work...
-{
-public:
-  Channel_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the Channel.
-  int initiate_connection (Channel *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _CHANNEL_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Concurrency_Strategies.h b/apps/Gateway/Gateway/Concurrency_Strategies.h
deleted file mode 100644
index 28e59a4b2e6..00000000000
--- a/apps/Gateway/Gateway/Concurrency_Strategies.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Concurrency_strategies.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONCURRENCY_STRATEGIES)
-#define _CONCURRENCY_STRATEGIES
-
-#include "ace/Synch.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MAP_MUTEX;
-#else /* ACE_HAS_THREADS */
-
-// Note that we only need to make the ACE_Task thread-safe if we are
-// using the multi-threaded Thr_Consumer_Proxy...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH_STRATEGY ACE_MT_SYNCH
-#else
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Supplier_Proxy.  In this
-// case, we use an RW_Mutex since we'll lookup Consumers far more
-// often than we'll update them.
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MAP_MUTEX;
-#else
-typedef ACE_Null_Mutex MAP_MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// = Forward decls
-class Thr_Consumer_Proxy;
-class Thr_Supplier_Proxy;
-class Consumer_Proxy;
-class Supplier_Proxy;
-
-#if defined (ACE_HAS_THREADS) && (defined (USE_OUTPUT_MT) || defined (USE_INPUT_MT))
-#if defined (USE_OUTPUT_MT)
-typedef Thr_Consumer_Proxy CONSUMER_PROXY;
-#else
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* USE_OUTPUT_MT */
-
-#if defined (USE_INPUT_MT)
-typedef Thr_Supplier_Proxy SUPPLIER_PROXY;
-#else
-typedef Supplier_Proxy SUPPLIER_PROXY;
-#endif /* USE_INPUT_MT */
-#else
-// Instantiate a non-multi-threaded Gateway.
-typedef Supplier_Proxy SUPPLIER_PROXY;
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* ACE_HAS_THREADS */
-
-#endif /* _CONCURRENCY_STRATEGIES */
diff --git a/apps/Gateway/Gateway/Consumer_Entry.cpp b/apps/Gateway/Gateway/Consumer_Entry.cpp
deleted file mode 100644
index c3dcd96ebbf..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Defines an entry in the Consumer Map.
-// $Id$
-
-#include "Consumer_Entry.h"
-
-Consumer_Entry::Consumer_Entry (void)
-{
-  ACE_NEW (this->destinations_, Consumer_Entry::ENTRY_SET);
-}
-
-Consumer_Entry::~Consumer_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Consumer_Entry::ENTRY_SET *
-Consumer_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Consumer_Entry::destinations (Consumer_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
diff --git a/apps/Gateway/Gateway/Consumer_Entry.h b/apps/Gateway/Gateway/Consumer_Entry.h
deleted file mode 100644
index fe502991514..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class IO_Handler;
-
-class Consumer_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Consumer_Map.
-public:
-  Consumer_Entry (void);
-  ~Consumer_Entry (void);
-
-  typedef ACE_Unbounded_Set<IO_Handler *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<IO_Handler *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Consumer_Map.cpp b/apps/Gateway/Gateway/Consumer_Map.cpp
deleted file mode 100644
index 6d16601f949..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (_CONSUMER_MAP_C)
-#define _CONSUMER_MAP_C
-
-#include "Consumer_Map.h"
-
-// Bind the Event_Addr to the INT_ID.
-
-int
-Consumer_Map::bind (Event_Addr event_addr, 
-		    Consumer_Entry *Consumer_Entry)
-{
-  return this->map_.bind (event_addr, Consumer_Entry);
-}
-
-// Find the Consumer_Entry corresponding to the Event_Addr.
-
-int
-Consumer_Map::find (Event_Addr event_addr, 
-		    Consumer_Entry *&Consumer_Entry)
-{
-  return this->map_.find (event_addr, Consumer_Entry);
-}
-
-// Unbind (remove) the Event_Addr from the map.
-
-int
-Consumer_Map::unbind (Event_Addr event_addr)
-{
-  return this->map_.unbind (event_addr);
-}
-
-Consumer_Map_Iterator::Consumer_Map_Iterator (Consumer_Map &rt)
-  : map_iter_ (rt.map_)
-{
-}
-
-int
-Consumer_Map_Iterator::next (Consumer_Entry *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<Event_Addr, Consumer_Entry *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-int
-Consumer_Map_Iterator::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _CONSUMER_MAP_C */
diff --git a/apps/Gateway/Gateway/Consumer_Map.h b/apps/Gateway/Gateway/Consumer_Map.h
deleted file mode 100644
index fd392afaf6e..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Map.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONSUMER_MAP_H)
-#define _CONSUMER_MAP_H
-
-#include "ace/Map_Manager.h"
-#include "Concurrency_Strategies.h"
-#include "Event.h"
-#include "Consumer_Entry.h"
-
-class Consumer_Map
-{
-  // = TITLE
-  //    Define a generic consumer map based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    This class makes it easier to use the Map_Manager.
-public:
-  int bind (Event_Addr event, Consumer_Entry *Consumer_Entry);
-  // Associate Event with the Consumer_Entry.
-
-  int find (Event_Addr event, Consumer_Entry *&Consumer_Entry);
-  // Break any association of EXID.
-
-  int unbind (Event_Addr event);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_;
-  // Map that associates Event Addrs (external ids) with Consumer_Entry *'s
-  // <internal IDs>.
-};
-
-class Consumer_Map_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Consumer Map.
-public:
-  Consumer_Map_Iterator (Consumer_Map &mm);
-  int next (Consumer_Entry *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_iter_;
-  // Map we are iterating over.
-};
-#endif /* _CONSUMER_MAP_H */
diff --git a/apps/Gateway/Gateway/Dispatch_Set.h b/apps/Gateway/Gateway/Dispatch_Set.h
deleted file mode 100644
index a867f1ca5ff..00000000000
--- a/apps/Gateway/Gateway/Dispatch_Set.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Dispatch_Set.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_DISPATCH_SET)
-#define _DISPATCH_SET
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Proxy_Handler;
-
-typedef ACE_Unbounded_Set<Proxy_Handler *> Dispatch_Set;
-typedef ACE_Unbounded_Set_Iterator<Proxy_Handler *> Dispatch_Set_Iterator;
-
-#endif /* _DISPATCH_SET */
diff --git a/apps/Gateway/Gateway/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/Peer_Message.h b/apps/Gateway/Gateway/Peer_Message.h
deleted file mode 100644
index d9e65650095..00000000000
--- a/apps/Gateway/Gateway/Peer_Message.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Peer_Message.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// This is the unique connection identifier that denotes a particular
-// Channel in the Gateway.
-typedef short CONN_ID;
-
-class Peer_Addr
-  // = TITLE
-  //     Peer address is used to identify the source/destination of a 
-  //     routing message.
-{
-public:
-  Peer_Addr (CONN_ID cid = -1, u_char lid = 0, u_char pay = 0)
-    : conn_id_ (cid), logical_id_ (lid), payload_ (pay) {}
-
-  int operator== (const Peer_Addr &pa) const
-  {
-    return this->conn_id_ == pa.conn_id_ 
-      && this->logical_id_ == pa.logical_id_
-      && this->payload_ == pa.payload_;
-  }
-
-  CONN_ID conn_id_;
-  // Unique connection identifier that denotes a particular Channel.
-
-  u_char logical_id_;
-  // Logical ID.
-
-  u_char payload_;
-  // Payload type.
-};
-
-
-class Peer_Header
-  // = TITLE
-  //    Fixed sized header.
-{
-public:
-  typedef u_short ROUTING_ID;
-  // Type used to route messages from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  ROUTING_ID routing_id_;
-  // Source ID.
-
-  size_t  len_;
-  // Length of the message in bytes.
-};
-
-class Peer_Message
-  // = TITLE
-  //    Variable-sized message (buf_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Peer message (see Peer protocol specs for
-  // exact #).
-
-  Peer_Header header_;
-  // Message header.
-
-  char buf_[MAX_PAYLOAD_SIZE];
-  // Message payload.
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/Gateway/Gateway/Routing_Entry.cpp b/apps/Gateway/Gateway/Routing_Entry.cpp
deleted file mode 100644
index cc270cfac3a..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Defines an entry in the Routing Table.
-// $Id$
-
-#include "Routing_Entry.h"
-
-Routing_Entry::Routing_Entry (int validity_interval)
-  : validity_interval_ (validity_interval)
-{
-  ACE_NEW (this->destinations_, Routing_Entry::ENTRY_SET);
-}
-
-Routing_Entry::~Routing_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Routing_Entry::ENTRY_SET *
-Routing_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Routing_Entry::destinations (Routing_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
-// Get the current validity interval for this route.
-
-int
-Routing_Entry::validity_interval (void)
-{
-  return this->validity_interval_;
-}
-
-// Set the current validity interval for this route.
-
-void
-Routing_Entry::validity_interval (int vi)
-{
-  this->validity_interval_ = vi;
-}
diff --git a/apps/Gateway/Gateway/Routing_Entry.h b/apps/Gateway/Gateway/Routing_Entry.h
deleted file mode 100644
index ab8e0eee53d..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Channel;
-
-class Routing_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Routing_Table.
-public:
-  Routing_Entry (int validity_interval = 0);
-  ~Routing_Entry (void);
-
-  typedef ACE_Unbounded_Set<Channel *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<Channel *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-  // = Set/get current validity interval for this routing entry.
-  int validity_interval (void);
-  void validity_interval (int);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-
-  int validity_interval_;
-  // The current validity interval of this link.
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Routing_Table.cpp b/apps/Gateway/Gateway/Routing_Table.cpp
deleted file mode 100644
index 3ef2f21bc1f..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-#if !defined (_ROUTING_TABLE_C)
-#define _ROUTING_TABLE_C
-
-
-#include "Routing_Table.h"
-
-/* Bind the EXT_ID to the INT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::bind (EXT_ID ext_id, INT_ID *int_id)
-{
-  return this->map_.bind (ext_id, int_id);
-}
-
-/* Find the INT_ID corresponding to the EXT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::find (EXT_ID ext_id, INT_ID *&int_id)
-{
-  return this->map_.find (ext_id, int_id);
-}
-
-/* Unbind (remove) the EXT_ID from the map. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Table<EXT_ID, INT_ID, LOCK>::unbind (EXT_ID ext_id)
-{
-  return this->map_.unbind (ext_id);
-}
-
-template <class EXT_ID, class INT_ID, class LOCK>
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::Routing_Iterator (Routing_Table<EXT_ID, 
-							  INT_ID, LOCK> &rt,
-							  int ignore_inactive)
-  : map_iter_ (rt.map_), 
-    ignore_inactive_ (ignore_inactive)
-{
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::next (INT_ID *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<EXT_ID, INT_ID *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Skip over inactive entries if necessary.
-      if (temp->int_id_->active () == 0 && this->ignore_inactive_)
-	continue;
-
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _ROUTING_TABLE_C */
diff --git a/apps/Gateway/Gateway/Routing_Table.h b/apps/Gateway/Gateway/Routing_Table.h
deleted file mode 100644
index 84194f13e49..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Table.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_TABLE_H)
-#define _ROUTING_TABLE_H
-
-#include "ace/Map_Manager.h"
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Table
-{
-  // = TITLE
-  //    Define a generic routing table based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    We need to have this table, rather than just using the Map_Manager
-  //    directly in order to ignore "inactive" routing entries...
-public:
-  int bind (EXT_ID ext_id, INT_ID *int_id);
-  // Associate EXT_ID with the INT_ID.
-
-  int find (EXT_ID ext_id, INT_ID *&int_id);
-  // Break any association of EXID.
-
-  int unbind (EXT_ID ext_id);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<EXT_ID, INT_ID *, LOCK> map_;
-  // Map external IDs to internal IDs.
-};
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Routing Table.
-public:
-  Routing_Iterator (Routing_Table<EXT_ID, INT_ID, LOCK> &mm, 
-		    int ignore_inactive = 1);
-  int next (INT_ID *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<EXT_ID, INT_ID *, LOCK> map_iter_;
-  int ignore_inactive_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Routing_Table.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#endif /* _ROUTING_TABLE_H */
diff --git a/apps/Gateway/Gateway/Thr_Channel.cpp b/apps/Gateway/Gateway/Thr_Channel.cpp
deleted file mode 100644
index 26e385e2727..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_Channel.h"
-// $Id$
-
-#include "Channel_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Output_Channel::Thr_Output_Channel (ROUTING_TABLE *rt,
-					Channel_Connector *cc,
-					ACE_Thread_Manager *thr_mgr,
-					int socket_queue_size)
-  : Output_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the Channel as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Output_Channel::handle_input (ACE_HANDLE h)
-{
-  this->Output_Channel::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Output_Channel object and spawn a new
-// thread.
-
-int 
-Thr_Output_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Input_Channels are single-threaded).
-
-int 
-Thr_Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Output_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Output_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send_peer (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Output_Channel %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Input_Channel::Thr_Input_Channel (ROUTING_TABLE *rt,
-				      Channel_Connector *cc,
-				      ACE_Thread_Manager *thr_mgr,
-				      int socket_queue_size)
-  : Input_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Input_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Input_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Input_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Input_Channel %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Channel.h b/apps/Gateway/Gateway/Thr_Channel.h
deleted file mode 100644
index a1dc91b1619..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_CHANNEL)
-#define _THR_CHANNEL
-
-#include "Channel.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Output_Channel : public Output_Channel
-  // = TITLE
-  //    Runs each Output Channel in a separate thread.
-{
-public:
-  Thr_Output_Channel (ROUTING_TABLE *, 
-		      Channel_Connector *, 
-		      ACE_Thread_Manager *,
-		      int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Output_Channel object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Input_Channel : public Input_Channel
-  // = TITLE
-  //    Runs each Input Channel in a separate thread.
-{
-public:
-  Thr_Input_Channel (ROUTING_TABLE *, 
-		     Channel_Connector *, 
-		     ACE_Thread_Manager *,
-		     int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_CHANNEL */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.cpp b/apps/Gateway/Gateway/Thr_IO_Handler.cpp
deleted file mode 100644
index 109cfad9c3f..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_IO_Handler.h"
-// $Id$
-
-#include "IO_Handler_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Handler::Thr_Consumer_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Consumer_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the IO_Handler as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Consumer_Handler::handle_input (ACE_HANDLE h)
-{
-  this->Consumer_Handler::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Handler object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Supplier_Handlers are single-threaded).
-
-int 
-Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Consumer_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Consumer_Handler %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Handler::Thr_Supplier_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Supplier_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Supplier_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Supplier_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Handler %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.h b/apps/Gateway/Gateway/Thr_IO_Handler.h
deleted file mode 100644
index ee056b35361..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "IO_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Handler : public Consumer_Handler
-  // = TITLE
-  //    Runs each Output IO_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Handler object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Handler : public Supplier_Handler
-  // = TITLE
-  //    Runs each Input IO_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp b/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
deleted file mode 100644
index f316e4e82bf..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// $Id$
-
-#include "Event_Channel.h"
-#include "Thr_Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Proxy::Thr_Consumer_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Consumer_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-// This method should be called only when the Consumer shuts down
-// unexpectedly.  This method marks the Proxy_Handler as having failed
-// and deactivates the ACE_Message_Queue (to wake up the thread
-// blocked on <dequeue_head> in svc()).
-// Thr_Output_Handler::handle_close () will eventually try to
-// reconnect...
-
-int 
-Thr_Consumer_Proxy::handle_input (ACE_HANDLE h)
-{
-  // Call down to the <Consumer_Proxy> to handle this first.
-  this->Consumer_Proxy::handle_input (h);
-
-  ACE_Service_Config::reactor ()->remove_handler 
-    (h, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL);
-
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Proxy object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Consumer has shut down unexpectedly).
-  else if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to Consumers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Queue up an event for transmission (must not block since
-// Supplier_Proxys may be single-threaded).
-
-int 
-Thr_Consumer_Proxy::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail 
-    (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit events to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Proxy::svc (void)
-{
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Consumer_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; 
-	   )
-	{
-	  if (this->send (mb) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-	}
-
-      ACE_ASSERT (errno == ESHUTDOWN);
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Consumer_Proxy %d on handle %d\n", 
-		  this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-
-	  ACE_OS::sleep (tv);
-	}
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Proxy::Thr_Supplier_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Supplier_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-int 
-Thr_Supplier_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive events from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Proxy::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Supplier_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes events
-      // for one connection it is OK to call down to the
-      // <Supplier_Proxy::handle_input> method, which blocks on input.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Proxy %d on handle %d\n", 
-		 this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.h b/apps/Gateway/Gateway/Thr_Proxy_Handler.h
deleted file mode 100644
index 275bc87b320..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Proxy_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Proxy : public Consumer_Proxy
-  // = TITLE
-  //    Runs each Output Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Proxy object and spawn a new
-  // thread.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-protected:
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Proxy : public Supplier_Proxy
-  // = TITLE
-  //    Runs each Input Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-protected:
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/cc_config b/apps/Gateway/Gateway/cc_config
deleted file mode 100644
index 96f9ebdedd7..00000000000
--- a/apps/Gateway/Gateway/cc_config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Conn ID  Hostname     Remote Port  Direction  Max Retry Delay  Local Port
-# -------  --------	----         ---------  ---------------  ----------
-   1       tango.cs	10004	     I          32		 20000
-#  2       tango.cs	10004	     O          32               
-   3       merengue.cs	10004	     O          32		 20001
-#  4       mambo.cs	10004	     O          32		 20000
-#  5       lambada.cs	10004	     O          32		 20000
-#  6       tango.cs	10004	     O          32		 20000
-#  7       tango.cs	5001	     I          32               
-#  8       tango.cs	5002	     O          32               
diff --git a/apps/Gateway/Gateway/rt_config b/apps/Gateway/Gateway/rt_config
deleted file mode 100644
index e951a0f09be..00000000000
--- a/apps/Gateway/Gateway/rt_config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Conn ID  Logical ID  Payload  Destinations
-# -------  ----------  -------  ------------  
-# 1        1           0	3,4,5
-  1        1           0	3
-  3        1           0	3           
-#  4        1           0	4
-#  5	   1	       0	5
diff --git a/apps/Gateway/Peer/Event.h b/apps/Gateway/Peer/Event.h
deleted file mode 100644
index 5e288edf910..00000000000
--- a/apps/Gateway/Peer/Event.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Event.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (EVENT)
-#define EVENT
-
-#include "ace/OS.h"
-
-// This is the unique connection identifier that denotes a particular
-// Proxy_Handler in the Gateway.
-typedef ACE_INT32 ACE_INT32;
-
-class Event_Key
-  // = TITLE
-  //     Address used to identify the source/destination of an event.
-  //
-  // = DESCRIPTION
-  //     This is really a "virtual forwarding address" thatis used to
-  //     decouple the filtering and forwarding logic of the Event
-  //     Channel from the format of the data.
-{
-public:
-  Event_Key (ACE_INT32 cid = -1, 
-	      u_char sid = 0, 
-	      u_char type = 0)
-    : conn_id_ (cid), 
-      supplier_id_ (sid), 
-      type_ (type) {}
-
-  int operator== (const Event_Key &event_addr) const
-  {
-    return this->conn_id_ == event_addr.conn_id_ 
-      && this->supplier_id_ == event_addr.supplier_id_
-      && this->type_ == event_addr.type_;
-  }
-
-  ACE_INT32 conn_id_;
-  // Unique connection identifier that denotes a particular
-  // Proxy_Handler.
-
-  ACE_INT32 supplier_id_;
-  // Logical ID.
-
-  ACE_INT32 type_;
-  // Event type.
-};
-
-class Event_Header
-  // = TITLE
-  //     Fixed sized header.
-  //
-  // = DESCRIPTION
-  //     This is designed to have a sizeof (16) to avoid alignment
-  //     problems on most platforms.
-{
-public:
-  typedef ACE_INT32 SUPPLIER_ID;
-  // Type used to forward events from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  void decode (void)
-    {
-      this->len_ = ntohl (this->len_);
-      this->supplier_id_ = ntohl (this->supplier_id_);
-      this->type_ = ntohl (this->type_);
-      this->priority_ = ntohl (this->priority_);
-    }
-  // Decode from network byte order to host byte order.
-
-  void encode (void)
-    {
-      this->len_ = htonl (this->len_);
-      this->supplier_id_ = htonl (this->supplier_id_);
-      this->type_ = htonl (this->type_);
-      this->priority_ = htonl (this->priority_);
-    }
-  // Encode from host byte order to network byte order.
-
-  size_t len_;
-  // Length of the data_ payload, in bytes.
-
-  SUPPLIER_ID supplier_id_;
-  // Source ID.
-
-  ACE_INT32 type_;
-  // Event type.
-
-  ACE_INT32 priority_;
-  // Event priority.
-};
-
-class Event
-  // = TITLE
-  //    Variable-sized event (data_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Event.
-
-  Event_Header header_;
-  // Event header.
-
-  char data_[MAX_PAYLOAD_SIZE];
-  // Event data.
-};
-
-#endif /* EVENT */
diff --git a/apps/Gateway/Peer/Gateway_Handler.cpp b/apps/Gateway/Peer/Gateway_Handler.cpp
deleted file mode 100644
index cfc9a7dad6f..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "ace/Get_Opt.h"
-// $Id$
-
-
-#include "Gateway_Handler.h"
-
-Gateway_Handler::Gateway_Handler (ACE_Thread_Manager *)
-  : routing_id_ (0),
-    msg_frag_ (0),
-    total_bytes_ (0)
-{
-  this->msg_queue ()->high_water_mark (Gateway_Handler::QUEUE_SIZE);
-}
-
-int
-Gateway_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %S\n", signum));
-
-  // Shut down the main event loop.
-  ACE_Service_Config::end_reactor_event_loop ();
-  return 0;
-}
-
-// Cache a binding to the HANDLER_MAP.
-
-void
-Gateway_Handler::map (HANDLER_MAP *m)
-{
-  this->map_ = m;
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that turns control
-// over to our application-specific Gateway handler.
-
-int
-Gateway_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "Gateway handler's fd = %d\n", 
-	     this->peer ().get_handle ()));
-
-  // Call down to the base class to activate and register this
-  // handler.
-  if (this->inherited::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enable"), -1);    
-
-  Gateway_Handler *this_ = this;
-
-  // Add ourselves to the map so we can be removed later on.
-  if (this->map_->bind (this->get_handle (), this_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "bind"), -1);    
-
-  char *to = ACE_OS::getenv ("TIMEOUT");
-  int timeout = to == 0 ? 100000 : ACE_OS::atoi (to);
-
-  // Schedule the time between disconnects.  This should really be a
-  // "tunable" parameter.
-  if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, timeout) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
-
-  // If there are messages left in the queue, make sure we 
-  // enable the ACE_Reactor appropriately to get them sent out.
-  if (this->msg_queue ()->is_empty () == 0
-      && ACE_Service_Config::reactor ()->schedule_wakeup (this, 
-							  ACE_Event_Handler::WRITE_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-
-  // First action is to wait to be notified of our routing id.
-  this->do_action_ = &Gateway_Handler::await_route_id;
-  return 0;
-}
-
-// Read messages from stdin and send them to the gatewayd.
-
-int
-Gateway_Handler::xmit_stdin (void)
-{
-  if (this->routing_id_ != -1)
-    {
-      ssize_t n;
-      ACE_Message_Block *mb;
-
-      ACE_NEW_RETURN (mb, 
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      Event *peer_msg = (Event *) mb->rd_ptr ();
-      peer_msg->header_.routing_id_ = this->routing_id_;
-
-      n = ACE_OS::read (ACE_STDIN, peer_msg->buf_, sizeof peer_msg->buf_);
-
-      switch (n)
-	{
-	case 0:
-	  ACE_DEBUG ((LM_DEBUG, "stdin closing down\n"));
-
-	  // Take stdin out of the ACE_Reactor so we stop trying to
-	  // send messages.
-	  if (ACE_Service_Config::reactor ()->remove_handler 
-	      (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n", "remove_handler"));
-	  delete mb;
-	  break;
-	case -1:
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-	  break;
-	default:
-	  peer_msg->header_.len_ = htonl (n);
-	  mb->wr_ptr (sizeof (Peer_Header) + n);
-
-	  if (this->put (mb) == -1)
-	    {
-	      if (errno == EWOULDBLOCK) // The queue has filled up!
-		ACE_ERROR ((LM_ERROR, "%p\n", 
-			   "gateway is flow controlled, so we're dropping messages"));
-	      else
-		ACE_ERROR ((LM_ERROR, "%p\n", "transmission failure in xmit_stdin"));
-	      
-	      // Caller is responsible for freeing a ACE_Message_Block
-	      // if failures occur.
-	      delete mb;
-	    }
-	}
-    }
-  return 0;
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-Taskd at the *front* of
-// the Message_List.
-
-int
-Gateway_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-ACE_Task the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again.
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    return -1;
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "queueing activated on handle %d to routing id %d\n",
-		 this->get_handle (), this->routing_id_));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      if (ACE_Service_Config::reactor ()->schedule_wakeup
-	  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-// Finish sending a message when flow control conditions abate.  This
-// method is automatically called by the ACE_Reactor.
-
-int 
-Gateway_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "in handle_output\n"));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-	{
-	case 0: 	  // Partial send.
-	  ACE_ASSERT (errno == EWOULDBLOCK);
-	  // Didn't write everything this time, come back later...
-	  break;
-
-	case -1:
-	  // Caller is responsible for freeing a ACE_Message_Block if
-	  // failures occur.
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "transmission failure in handle_output"));
-
-	  /* FALLTHROUGH */
-	default: // Sent the whole thing.
-	  
-	  // If we succeed in writing the entire message (or we did
-	  // not fail due to EWOULDBLOCK) then check if there are more
-	  // messages on the Message_List.  If there aren't, tell the
-	  // ACE_Reactor not to notify us anymore (at least until
-	  // there are new messages queued up).
-
-	  if (this->msg_queue ()->is_empty ())
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "queue now empty on handle %d to routing id %d\n",
-			  this->get_handle (), 
-			  this->routing_id_));
-
-	      if (ACE_Service_Config::reactor ()->cancel_wakeup
-		  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-		ACE_ERROR ((LM_ERROR, "%p\n", "cancel_wakeup"));
-	    }
-	}
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "%p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may ACE_Task if necessary).
-
-int 
-Gateway_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); 
-}
-
-// Send an Peer message to gatewayd.
-
-int
-Gateway_Handler::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;	
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < (ssize_t) len)
-    {
-      // Re-adjust pointer to skip over the part we did send.
-      mb->rd_ptr (n);
-      this->total_bytes_ += n;
-    }
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      this->total_bytes_ += n;
-      delete mb;
-      errno = 0;
-    }
-  ACE_DEBUG ((LM_DEBUG, "sent %d bytes, total bytes sent = %d\n",
-	     n, this->total_bytes_));
-  return n;
-}
-
-// Receive an Peer message from gatewayd.  Handles fragmentation.
-
-int
-Gateway_Handler::recv_peer (ACE_Message_Block *&mb)
-{ 
-  Event *peer_msg;
-  size_t       len;
-  ssize_t      n;
-  size_t       offset = 0;
-
-  if (this->msg_frag_ == 0)
-    {
-      ACE_NEW_RETURN (this->msg_frag_,
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      // No existing fragment...
-      if (this->msg_frag_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "out of memory\n"), -1);
-
-      peer_msg = (Event *) this->msg_frag_->rd_ptr ();
-
-      switch (n = this->peer ().recv (peer_msg, sizeof (Peer_Header)))
-	{
-	case sizeof (Peer_Header):
-	  len = ntohl (peer_msg->header_.len_);
-	  if (len <= sizeof peer_msg->buf_)
-	    {
-	      this->msg_frag_->wr_ptr (sizeof (Peer_Header));
-	      break; // The message is within the maximum size range.
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "message too long = %d\n", len));
-	  /* FALLTHROUGH */
-	default:
-	  ACE_ERROR ((LM_ERROR, "invalid length = %d\n", n));
-	  n = -1;
-	  /* FALLTHROUGH */
-	case -1:
-	  /* FALLTHROUGH */
-	case 0:
-	  // Make sure to free up memory on error returns.
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-    }
-  else
-    {
-      offset = this->msg_frag_->length () - sizeof (Peer_Header);
-      len    = peer_msg->header_.len_ - offset;
-    }
-
-  switch (n = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-	{
-          // This shouldn't happen since the ACE_Reactor
-	  // just triggered us to handle pending I/O!
-	  ACE_DEBUG ((LM_DEBUG, "unexpected recv failure\n"));
-	  // Since ACE_DEBUG might change errno, we need to reset it
-	  // here.
-	  errno = EWOULDBLOCK;
-	  return -1;
-        }
-      else
-	/* FALLTHROUGH */;
-
-    case 0: // EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return n;
-
-    default:
-      if (n != (ssize_t) len)
-	// Re-adjust pointer to skip over the part we've read.
-	{
-	  this->msg_frag_->wr_ptr (n);
-	  errno = EWOULDBLOCK;
-	  // Inform caller that we didn't get the whole message.
-	  return -1; 
-	}
-      else
-	{
-	  // Set the write pointer at 1 past the end of the message.
-	  this->msg_frag_->wr_ptr (n);
-
-	  // Set the read pointer to the beginning of the message.
-	  this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-	  mb = this->msg_frag_;
-
-	  // Reset the pointer to indicate we've got an entire
-	  // message.
-	  this->msg_frag_ = 0; 
-	}
-      return n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the
-// gatewayd, as well as stdio).
-
-int 
-Gateway_Handler::handle_input (ACE_HANDLE sd)
-{
-  ACE_DEBUG ((LM_DEBUG, "in handle_input, sd = %d\n", sd));
-  if (sd == ACE_STDIN) // Handle message from stdin.
-    return this->xmit_stdin ();
-  else
-    // Perform the appropriate action depending on the state we are
-    // in.
-    return (this->*do_action_) ();
-}
-
-// Action that receives the route id.  
-
-int
-Gateway_Handler::await_route_id (void)
-{
-  ssize_t n = this->peer ().recv (&this->routing_id_, 
-				  sizeof this->routing_id_);
-
-  if (n != sizeof this->routing_id_)
-    {
-      if (n == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "gatewayd has closed down unexpectedly\n"), -1);
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "%p, bytes received on handle %d = %d\n", 
-			  "recv", this->get_handle (), n), -1);
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG, "assigned routing id %d\n", 
-		this->routing_id_));
-
-  // Transition to the action that waits for Peer messages.
-  this->do_action_ = &Gateway_Handler::await_messages;
-
-  // Reset standard input.
-  ACE_OS::rewind (stdin);
-
-  // Register this handler to receive test messages on stdin.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (ACE_STDIN, this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Action that receives messages.
-
-int
-Gateway_Handler::await_messages (void)
-{
-  ACE_Message_Block *mb = 0;
-  ssize_t n = this->recv_peer (mb);
-
-  switch (n)
-    {
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR, "gatewayd has closed down\n"), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-	// A short-read, we'll come back and finish it up later on!
-	return 0;
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv_peer"), -1);
-      /* NOTREACHED */
-    default:
-      {
-	// We got a valid message, so let's process it now!  At the
-	// moment, we just print out the message contents...
-
-	Event  *peer_msg = (Event *) mb->rd_ptr ();
-	this->total_bytes_ += mb->length ();
-
-#if defined (VERBOSE)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, len = %d, payload = %*s",
-		   peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		   peer_msg->header_.len_, peer_msg->buf_));
-#else
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, cur len = %d, total len = %d\n",
-		    peer_msg->header_.routing_id_, 
-		    peer_msg->header_.len_, 
-		    this->total_bytes_));
-#endif
-	delete mb;
-	return 0;
-      }
-    }
-}
-
-// Periodically send messages via ACE_Reactor timer mechanism.
-
-int
-Gateway_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Unbind ourselves from the map.
-      if (this->map_->unbind (this->get_handle ()) == -1)
-	ACE_ERROR ((LM_ERROR, "%p\n", "unbind"));
-
-      // Shut down the handler.
-      this->handle_close ();
-    }
-  return 0;
-}
-
-// Handle shutdown of the Gateway_Handler object.
-
-int
-Gateway_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutting down Gateway_Handler on handle %d\n", 
-		 this->get_handle ()));
-
-      // Explicitly remove ourselves for handle 0 (the ACE_Reactor
-      // removes this->handle (), note that
-      // ACE_Event_Handler::DONT_CALL instructs the ACE_Reactor *not*
-      // to call this->handle_close(), which would otherwise lead to
-      // recursion!).
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	ACE_ERROR ((LM_ERROR, "handle = %d: %p\n", 
-		   0, "remove_handler"));
-
-      // Deregister this handler with the ACE_Reactor.
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::RWE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "handle = %d: %p\n", 
-			  this->get_handle (), "remove_handler"), -1);
-
-      // Close down the peer.
-      this->peer ().close ();
-    }
-  return 0;
-}
-
-Gateway_Acceptor::Gateway_Acceptor (Gateway_Handler *handler)
-  : gateway_handler_ (handler)
-{
-  this->gateway_handler_->map (&this->map_);
-}
-
-// Note how this method just passes back the pre-allocated
-// Gateway_Handler instead of having the ACE_Acceptor allocate a new
-// one each time!
-
-Gateway_Handler *
-Gateway_Acceptor::make_svc_handler (void)
-{
-  return this->gateway_handler_;
-}
-
-int 
-Gateway_Acceptor::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", signum));
-  return 0;
-}
-
-/* Returns information on the currently active service. */
-
-int
-Gateway_Acceptor::info (char **strp, size_t length) const
-{
-  char buf[BUFSIZ];
-  char addr_str[BUFSIZ];
-
-  ACE_INET_Addr addr;
-
-  if (this->acceptor ().get_local_addr (addr) == -1)
-    return -1;
-  else if (addr.addr_to_string (addr_str, sizeof addr) == -1)
-    return -1;
-
-  ACE_OS::sprintf (buf, "%s\t %s/%s %s",
-	     "Gateway peer daemon", addr_str, "tcp",
-	     "# IRIDIUM SRP traffic generator and data sink\n");
-
-  if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
-    return -1;
-  else
-    ACE_OS::strncpy (*strp, buf, length);
-  return ACE_OS::strlen (buf);
-}
-
-// Hook called by the explicit dynamic linking facility to terminate
-// the peer.
-
-int
-Gateway_Acceptor::fini (void)
-{
-  HANDLER_ITERATOR mi (this->map_);
-  
-  for (MAP_ENTRY *me = 0;
-       mi.next (me) != 0; 
-       mi.advance ())
-    {
-      if (me->int_id_->get_handle () != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "closing down handle %d\n", 
-		      me->int_id_->get_handle ()));
-	  me->int_id_->handle_close ();
-	}
-      else
-	ACE_DEBUG ((LM_DEBUG, "already closed %d\n"));
-      me->int_id_->destroy (); // Will trigger a delete.
-    }
-
-  this->gateway_handler_->destroy (); // Will trigger a delete.
-  return inherited::fini ();
-}
-
-// Hook called by the explicit dynamic linking facility to initialize
-// the peer.
-
-int
-Gateway_Acceptor::init (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "dp:", 0);
-  ACE_INET_Addr addr;
-
-  for (int c; (c = get_opt ()) != -1; )
-    {
-      switch (c)
-	{
-	case 'p': 
-	  addr.set (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'd':
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  if (ACE_Service_Config::reactor ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-    
-  if (this->open (addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Service_Config::reactor ()->register_handler 
-	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
-
-  ACE_Sig_Set sig_set;
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-
-  // Register ourselves to receive SIGINT and SIGQUIT so we can shut
-  // down gracefully via signals.
-  
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, 
-						 this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Dynamically linked factory function that dynamically allocates a
-// new Gateway_Acceptor object.
-
-ACE_Service_Object *
-_alloc_peerd (void)
-{
-  // This function illustrates how we can associate a ACE_Svc_Handler
-  // with the ACE_Acceptor at initialization time.
-  Gateway_Handler *handler;
-  
-  ACE_NEW_RETURN (handler, Gateway_Handler, 0);
-  ACE_Service_Object *temp;
-  
-  ACE_NEW_RETURN (temp, Gateway_Acceptor (handler), 0);
-  return temp;
-}
diff --git a/apps/Gateway/Peer/Gateway_Handler.h b/apps/Gateway/Peer/Gateway_Handler.h
deleted file mode 100644
index 6dc4539e6b7..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-/* These Gateway handler classes process Peer messages sent from the
-   communication gateway daemon (gatewayd) to its various peers, e.g.,
-   CF and ETS, (represented collectively in this prototype as peerd).
-   .  These classes works as follows:
-   
-   1. Gateway_Acceptor creates a listener endpoint and waits passively
-      for gatewayd to connect with it.
-
-   2. When gatewayd connects, Gateway_Acceptor creates an
-      Gateway_Handler object that sends/receives messages from
-      gatewayd.
-
-   3. Gateway_Handler waits for gatewayd to inform it of its routing
-      ID, which is prepended to all outgoing messages send from peerd.
-
-   4. Once the routing ID is set, peerd periodically sends messages to
-      gatewayd.  Peerd also receives and "processes" messages
-      forwarded to it from gatewayd.  In this program, peerd
-      "processes" messages by writing them to stdout. */
-
-#if !defined (GATEWAY_HANDLER)
-#define GATEWAY_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Map_Manager.h"
-#include "Peer_Message.h"
-
-// Forward declaration.
-class Gateway_Handler;
-
-// Maps a ACE_HANDLE onto a Gateway_Handler *.
-typedef ACE_Map_Manager <ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_MAP;
-typedef ACE_Map_Iterator<ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_ITERATOR;
-typedef ACE_Map_Entry <ACE_HANDLE, Gateway_Handler *> MAP_ENTRY;
-
-// Handle Peer messages arriving as events. 
-
-class Gateway_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  Gateway_Handler (ACE_Thread_Manager * = 0);
-
-  virtual int open (void * = 0);
-  // Initialize the handler (called by ACE_Acceptor::handle_input())
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process peer messages.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-  // Periodically send messages via ACE_Reactor timer mechanism.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform object termination.
-
-  void map (HANDLER_MAP *);
-  // Cache a binding to the HANDLER_MAP.
-
-protected:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> inherited;
-
-  // We'll allow up to 16 megabytes to be queued per-output
-  // channel!!!!  This is clearly a policy in search of refinement...
-  enum { QUEUE_SIZE = 1024 * 1024 * 16 };
-
-  int handle_signal (int signum, siginfo_t *, ucontext_t *);
-
-  Peer_Header::ROUTING_ID routing_id_;
-  // Routing ID of the peer (obtained from gatewayd).
-
-  virtual int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive an Peer message from gatewayd.
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send an Peer message to gatewayd.
-
-  int xmit_stdin (void);
-  // Receive a message from stdin and send it to the gateway.
-
-  int (Gateway_Handler::*do_action_) (void);
-  // Pointer-to-member-function for the current action to run in this state.
-
-  int await_route_id (void);
-  // Action that receives the route id.  
-
-  int await_messages (void);
-  // Action that receives messages.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from gateway.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received to the gateway.
-
-  HANDLER_MAP *map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-};
-
-// A factory class that accept connections from gatewayd and
-// dynamically creates a new Gateway_Handler object to do the dirty work.
-
-class Gateway_Acceptor : public ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR>
-{
-public:  
-  // = Initialization methods, called when dynamically linked.
-  Gateway_Acceptor (Gateway_Handler *handler);
-  virtual int init (int argc, char *argv[]);
-  // Initialize the acceptor.
-
-  virtual int info (char **, size_t) const;
-  // Return info about this service.
-
-  virtual int fini (void);
-  // Perform termination.
-
-  virtual Gateway_Handler *make_svc_handler (void);
-  // Factory method that creates the Gateway_Handler once.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Handle various signals (e.g., SIGPIPE)
-
-  HANDLER_MAP map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-  
-  Gateway_Handler *gateway_handler_;
-  // Pointer to memory allocated exactly once.
-
-  typedef ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR> inherited;
-};
-
-// Factory function that allocates a new Peer daemon.
-extern "C" ACE_Service_Object *_alloc_peerd (void);
-
-#endif /* GATEWAY_HANDLER */
-
diff --git a/apps/Gateway/Peer/Peer_Message.h b/apps/Gateway/Peer/Peer_Message.h
deleted file mode 100644
index 67f57f148cb..00000000000
--- a/apps/Gateway/Peer/Peer_Message.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Define the Peer message schema (this may change).
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// Fixed sized header.
-
-class Peer_Header
-{
-public:
-// Type used to route messages from gatewayd.
-  typedef short ROUTING_ID;
-
-  enum
-  {
-    INVALID_ID = -1 // No peer may use this number.
-  };
-
-  // Source ID.
-  ROUTING_ID routing_id_;
-
-  // Length of the message in bytes.
-  size_t  len_;
-};
-
-// Variable-sized message (buf_ may be variable-sized between
-// 0 and MAX_PAYLOAD_SIZE).
-
-class Peer_Message
-{
-public:
-  // The maximum size of an Peer message (see Peer protocol specs for exact #).
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-
-  Peer_Header header_;
-
-  // Message payload
-  char buf_[MAX_PAYLOAD_SIZE];
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/JAWS/PROTOTYPE/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..9c00c783554 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
@@ -147,15 +147,11 @@ HTTP_Headers::value_reset (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 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_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/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.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
index cc406850df6..95be98cb02c 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
@@ -1,19 +1,19 @@
 // $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"
 
 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_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 (unsigned long number) const
 {
   unsigned long d = 3;
 
@@ -31,7 +31,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 +46,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)
@@ -77,7 +77,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::JAWS_Cache_Hash (ACE_Allocator *alloc
 }
 
 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_)
     {
@@ -98,7 +98,7 @@ 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);
 
@@ -109,8 +109,8 @@ 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);
 
@@ -121,8 +121,8 @@ 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);
@@ -143,8 +143,8 @@ 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);
@@ -165,10 +165,10 @@ 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);
@@ -192,7 +192,7 @@ 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);
 
@@ -203,8 +203,8 @@ 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);
 
@@ -216,7 +216,7 @@ 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_;
 }
@@ -224,4 +224,4 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const
 
 
 
-#endif /* JAWS_CACHEHASH_T_CPP */
+#endif /* UTL_CACHEHASH_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h
index 2d310873cb2..1d8a0a2c4ae 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h
@@ -1,40 +1,40 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_HASH_T_H
-#define JAWS_CACHE_HASH_T_H
+#ifndef ACE_CACHE_HASH_T_H
+#define ACE_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;
+class ACE_Hash_Bucket_Manager;
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Hash
+class ACE_Cache_Hash
 {
 public:
 
-  typedef JAWS_Hash_Bucket_Manager<EXT_ID, JAWS_Cache_Object *, EQ_FUNC>
+  typedef ACE_Hash_Bucket_Manager<EXT_ID, ACE_Cache_Object *, EQ_FUNC>
           CACHE_BUCKET_MANAGER;
 
-  JAWS_Cache_Hash (ACE_Allocator *alloc = 0, size_t size = 521);
+  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 ~JAWS_Cache_Hash (void);
+  virtual ~ACE_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 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, JAWS_Cache_Object *&int_id);
+  int unbind (const EXT_ID &ext_id, ACE_Cache_Object *&int_id);
 
   size_t size (void) const;
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp
index 36575ef2741..7b26f02d36a 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp
@@ -1,13 +1,13 @@
 // $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"
 
 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),
@@ -33,7 +33,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_Heap (ACE_Allocator *alloc,
 }
 
 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)
     {
@@ -54,31 +54,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_);
 }
 
 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;
@@ -110,7 +110,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 +131,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;
@@ -149,7 +149,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 +181,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];
 
@@ -203,8 +203,8 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos)
 }
 
 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;
@@ -223,7 +223,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
 }
 
 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;
@@ -244,7 +244,7 @@ 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;
@@ -263,8 +263,8 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
 
 
 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 +273,10 @@ 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/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h
index 16fbe890fe6..f900ca29955 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h
@@ -1,35 +1,35 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_HEAP_T_H
-#define JAWS_CACHE_HEAP_T_H
+#ifndef ACE_CACHE_HEAP_T_H
+#define ACE_CACHE_HEAP_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;
+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;
 
 
 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 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;
+  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;
 
-  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 +41,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);
@@ -77,20 +77,20 @@ private:
 
 
 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);
+  ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id);
   unsigned int priority (void);
 
 private:
 
   EXT_ID ext_id_;
-  JAWS_Cache_Object *int_id_;
+  ACE_Cache_Object *int_id_;
 
   size_t heap_idx_;
 
@@ -100,4 +100,4 @@ private:
 #include "JAWS/Cache_Heap_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_CACHE_HEAP_T_H */
+#endif /* ACE_CACHE_HEAP_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
index f62c990ba1c..dd9a54a6ad4 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#ifndef JAWS_CACHE_LIST_T_CPP
-#define JAWS_CACHE_LIST_T_CPP
+#ifndef ACE_CACHE_LIST_T_CPP
+#define ACE_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,
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_List (ACE_Allocator *alloc,
                                                        size_t maxsize)
   : allocator_ (alloc),
     maxsize_ (maxsize),
@@ -20,7 +20,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_List (ACE_Allocator *alloc,
 }
 
 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)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_List (void)
 {
   while (this->head_ != 0)
     this->remove (this->head_);
@@ -29,31 +29,31 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void)
 }
 
 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
+ACE_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
+ACE_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
+ACE_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
+ACE_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 *,
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *,
                                                 size_t new_maxsize)
 {
   this->maxsize_ = new_maxsize;
@@ -61,7 +61,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *,
 }
 
 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)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *item)
 {
   /* ASSERT: this->size_ < this->maxsize_ */
   item->next_ = 0;
@@ -78,8 +78,8 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *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)
+ACE_Cache_List<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;
@@ -96,7 +96,7 @@ JAWS_Cache_List<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_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
 {
   /* ASSERT: this->size_ > 0 */
   this->size_--;
@@ -113,7 +113,7 @@ JAWS_Cache_List<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_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item)
 {
   this->size_--;
   this->item_ = item;
@@ -143,8 +143,8 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item)
 }
 
 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)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
+                                               ACE_Cache_Object *&int_id)
 {
   if (this->is_empty ())
     return -1;
@@ -161,7 +161,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
 }
 
 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)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
 {
   if (item == 0)
     return 0;
@@ -176,7 +176,7 @@ JAWS_Cache_List<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_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
+ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
 {
   if (item == 0)
     return 0;
@@ -192,8 +192,8 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
 
 
 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)
+ACE_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::
+ACE_Cache_List_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id)
   : ext_id_ (ext_id),
     int_id_ (int_id)
 {
@@ -201,10 +201,10 @@ JAWS_Cache_List_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_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
+ACE_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
 {
   return this->int_id_->priority ();
 }
 
 
-#endif /* JAWS_CACHE_LIST_T_CPP */
+#endif /* ACE_CACHE_LIST_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h
index 7dd9c7c8ca1..49680af9987 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h
@@ -1,22 +1,22 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_LIST_T_H
-#define JAWS_CACHE_LIST_T_H
+#ifndef ACE_CACHE_LIST_T_H
+#define ACE_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;
+class ACE_Cache_Manager;
 
 template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_List_Item;
+class ACE_Cache_List_Item;
 
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_List
+class ACE_Cache_List
 // Roll my own heap here.  Eventually, a heap should be its own
 // standalone data structure.
 //
@@ -25,14 +25,14 @@ class JAWS_Cache_List
 {
 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;
+  typedef ACE_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager;
+  typedef ACE_Cache_List_Item<EXT_ID, FACT, H_FN, E_FN> Cache_List_Item;
 
-  JAWS_Cache_List (ACE_Allocator *alloc = 0, size_t maxsize = 8192);
+  ACE_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);
+  ~ACE_Cache_List (void);
 
   int is_empty (void) const;
   int is_full (void) const;
@@ -44,10 +44,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);
@@ -83,29 +83,29 @@ private:
 
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_List_Item
+class ACE_Cache_List_Item
 {
 
-  friend class JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN>;
+  friend class ACE_Cache_List<EXT_ID, FACT, H_FN, E_FN>;
 
 public:
 
-  typedef JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List;
+  typedef ACE_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);
+  ACE_Cache_List_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id);
   unsigned int priority (void);
 
 private:
 
   EXT_ID ext_id_;
-  JAWS_Cache_Object *int_id_;
+  ACE_Cache_Object *int_id_;
 
-  JAWS_Cache_List_Item *next_;
-  JAWS_Cache_List_Item *prev_;
+  ACE_Cache_List_Item *next_;
+  ACE_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 */
+#endif /* ACE_CACHE_LIST_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp
index a91ac38375a..0b1d300d0d1 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp
@@ -7,36 +7,36 @@
 #include "JAWS/Cache_Manager.h"
 #include "JAWS/Cache_List_T.h"
 
-JAWS_String_Hash_Functor::JAWS_String_Hash_Functor (const char *s)
+ACE_String_Hash_Functor::ACE_String_Hash_Functor (const char *s)
   : i_ (0)
 {
   this->i_ = ACE::hash_pjw (s);
 }
 
-JAWS_String_Hash_Functor::operator unsigned long (void) const
+ACE_String_Hash_Functor::operator unsigned long (void) const
 {
   return this->i_;
 }
 
-JAWS_String_Equal_Functor::JAWS_String_Equal_Functor (const char *s1,
+ACE_String_Equal_Functor::ACE_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
+ACE_String_Equal_Functor::operator int (void) const
 {
   return this->i_ == 0;
 }
 
-JAWS_Strdup_String::JAWS_Strdup_String (void)
+ACE_Strdup_String::ACE_Strdup_String (void)
   : c_ (0),
     s_ (0)
 {
 }
 
-JAWS_Strdup_String::JAWS_Strdup_String (const char *s)
+ACE_Strdup_String::ACE_Strdup_String (const char *s)
   : c_ (0),
     s_ (0)
 {
@@ -44,14 +44,14 @@ JAWS_Strdup_String::JAWS_Strdup_String (const char *s)
   this->s_ = ACE_OS::strdup (s);
 }
 
-JAWS_Strdup_String::JAWS_Strdup_String (const JAWS_Strdup_String &s)
+ACE_Strdup_String::ACE_Strdup_String (const ACE_Strdup_String &s)
   : c_ (s.c_),
     s_ (s.s_)
 {
   ++*(this->c_);
 }
 
-JAWS_Strdup_String::~JAWS_Strdup_String (void)
+ACE_Strdup_String::~ACE_Strdup_String (void)
 {
   if (this->c_ && --*(this->c_) == 0)
     {
@@ -63,13 +63,13 @@ JAWS_Strdup_String::~JAWS_Strdup_String (void)
   this->c_ = 0;
 }
 
-JAWS_Strdup_String::operator const char * (void) const
+ACE_Strdup_String::operator const char * (void) const
 {
   return this->s_;
 }
 
 void
-JAWS_Strdup_String::operator = (const char *s)
+ACE_Strdup_String::operator = (const char *s)
 {
   if (this->c_ && --*(this->c_) == 0)
     {
@@ -82,7 +82,7 @@ JAWS_Strdup_String::operator = (const char *s)
 }
 
 void
-JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s)
+ACE_Strdup_String::operator = (const ACE_Strdup_String &s)
 {
   if (this->c_ && --*(this->c_) == 0)
     {
@@ -97,93 +97,93 @@ JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s)
 
 #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,
+template class ACE_Hash_Bucket_Item<ACE_Strdup_String, ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_DLCStack<ACE_Strdup_String, ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_DLCStack_Iterator<ACE_Strdup_String,
+                                                 ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_Manager<ACE_Strdup_String,
+                                       ACE_Cache_Object *,
+                                       ACE_String_Equal_Functor>;
+template class ACE_Cache_Hash<ACE_Strdup_String,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_List_Item<ACE_Strdup_String,
+                                   ACE_Referenced_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>;
+template class ACE_Cache_List<ACE_Strdup_String,
+                              ACE_Referenced_Cache_Object_Factory,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_Manager<ACE_Strdup_String,
+                                 ACE_Referenced_Cache_Object_Factory,
+                                 ACE_String_Hash_Functor,
+                                 ACE_String_Equal_Functor>;
+template class ACE_Cache_List_Item<ACE_Strdup_String,
+                                   ACE_Counted_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>;
+template class ACE_Cache_List<ACE_Strdup_String,
+                              ACE_Counted_Cache_Object_Factory,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_Manager<ACE_Strdup_String,
+                                 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<JAWS_Counted_Cache_Object_Factory,
+template class ACE_Singleton<ACE_Counted_Cache_Object_Factory,
                              ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Referenced_Cache_Manager,
+template class ACE_Singleton<ACE_String_Referenced_Cache_Manager,
                              ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Counted_Cache_Manager,
+template class ACE_Singleton<ACE_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, \
+#pragma instantiate ACE_Hash_Bucket_Item<ACE_Strdup_String, ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_DLCStack<ACE_Strdup_String, \
+                                             ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_DLCStack_Iterator<ACE_Strdup_String, \
+                                                      ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_Manager<ACE_Strdup_String, \
+                                            ACE_Cache_Object *, \
+                                            ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Hash<ACE_Strdup_String, \
+                                   ACE_String_Hash_Functor, \
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap_Item<ACE_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_String_Hash_Functor, \
+                                        ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap<ACE_Strdup_String, \
+                                   ACE_Referenced_Cache_Object_Factory, \
+                                   ACE_String_Hash_Functor, \
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Manager<ACE_Strdup_String, \
+                                      ACE_Referenced_Cache_Object_Factory, \
+                                      ACE_String_Hash_Functor, \
+                                      ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap_Item<ACE_Strdup_String, \
+                                        ACE_Counted_Cache_Object_Factory, \
+                                        ACE_String_Hash_Functor, \
+                                        ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap<ACE_Strdup_String, \
+                                   ACE_Counted_Cache_Object_Factory, \
+                                   ACE_String_Hash_Functor, \
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Manager<ACE_Strdup_String, \
+                                      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<JAWS_Counted_Cache_Object_Factory, \
+#pragma instantiate ACE_Singleton<ACE_Counted_Cache_Object_Factory, \
                                   ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Referenced_Cache_Manager, \
+#pragma instantiate ACE_Singleton<ACE_String_Referenced_Cache_Manager, \
                                   ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Counted_Cache_Manager, \
+#pragma instantiate ACE_Singleton<ACE_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
index 723e6729f33..bc0d332b94d 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
@@ -1,8 +1,8 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_MANAGER_H
-#define JAWS_CACHE_MANAGER_H
+#ifndef ACE_CACHE_MANAGER_H
+#define ACE_CACHE_MANAGER_H
 
 #include "ace/OS.h"
 #include "ace/ACE.h"
@@ -10,38 +10,38 @@
 
 #include "JAWS/Cache_Manager_T.h"
 
-class JAWS_String_Hash_Functor
+class ACE_String_Hash_Functor
 {
 public:
-  JAWS_String_Hash_Functor (const char *s);
+  ACE_String_Hash_Functor (const char *s);
   operator unsigned long (void) const;
 
 private:
   unsigned long i_;
 };
 
-class JAWS_String_Equal_Functor
+class ACE_String_Equal_Functor
 {
 public:
-  JAWS_String_Equal_Functor (const char *s1, const char *s2);
+  ACE_String_Equal_Functor (const char *s1, const char *s2);
   operator int (void) const;
 
 private:
   int i_;
 };
 
-class JAWS_Strdup_String
+class ACE_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);
+  ACE_Strdup_String (void);
+  ACE_Strdup_String (const char *s);
+  ACE_Strdup_String (const ACE_Strdup_String &s);
+  ~ACE_Strdup_String (void);
 
   operator const char * (void) const;
   void operator = (const char *s);
-  void operator = (const JAWS_Strdup_String &s);
+  void operator = (const ACE_Strdup_String &s);
 
 private:
 
@@ -50,17 +50,17 @@ private:
 
 };
 
-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 ACE_Cache_Manager<ACE_Strdup_String,
+                          ACE_Referenced_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_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;
+typedef ACE_Cache_Manager<ACE_Strdup_String,
+                          ACE_Counted_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_String_Counted_Cache_Manager;
 
 
-#endif /* JAWS_CACHE_MANAGER_H */
+#endif /* ACE_CACHE_MANAGER_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
index 27f274429bf..9acc3d6bdd3 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
@@ -1,7 +1,7 @@
 // $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"
@@ -11,9 +11,9 @@ class Cache_Manager;
 #include <iostream.h>
 
 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,
@@ -80,9 +80,9 @@ 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,
@@ -150,13 +150,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 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 +177,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,8 +191,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_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;
 
@@ -216,7 +216,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   obj->internal (new KEY (key));
 
   KEY old_key;
-  JAWS_Cache_Object *old_obj;
+  ACE_Cache_Object *old_obj;
 
   result = this->hash_->rebind (key, obj, old_key, old_obj);
   if (result == -1)
@@ -257,10 +257,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>
 ::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;
@@ -281,11 +281,11 @@ 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 (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)
@@ -310,8 +310,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>
-::DROP_i (JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::DROP_i (ACE_Cache_Object *&obj)
 {
   int result = 0;
 
@@ -330,8 +330,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 +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>
-::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,8 +348,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>
-::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_)
@@ -415,8 +415,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,8 +425,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>
-::DROP (JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::DROP (ACE_Cache_Object *&obj)
 {
   if (obj == 0)
     return -1;
@@ -489,7 +489,7 @@ 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 (void)
 {
   ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
@@ -499,8 +499,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 +513,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,7 +528,7 @@ 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_);
@@ -537,22 +537,22 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void)
 }
 
 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;
 }
 
 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 *)
+ACE_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/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h
index f3c14de3671..3d1557f33dc 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h
@@ -2,36 +2,36 @@
 // Hey Emacs!  This is a C++ file!
 // $Id$
 
-#ifndef JAWS_CACHE_MANAGER_T_H
-#define JAWS_CACHE_MANAGER_T_H
+#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"
 
-template <class KEY, class HASH_FUNC, class EQ_FUNC> class JAWS_Cache_Hash;
+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_Heap;
+class ACE_Cache_Heap;
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_List;
+class ACE_Cache_List;
 
 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>;
+  friend class ACE_Cache_List<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;
+  typedef ACE_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> Cache_Hash;
+  typedef ACE_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC> Cache_Heap;
 
-  JAWS_Cache_Manager (ACE_Allocator *alloc = 0,
-                     JAWS_Cache_Object_Factory *cof = 0,
+  ACE_Cache_Manager (ACE_Allocator *alloc = 0,
+                     ACE_Cache_Object_Factory *cof = 0,
 
                      size_t hashsize = 2048,   // number of hash buckets
                      size_t maxsize = 65535,   // max number of in memory
@@ -54,7 +54,7 @@ 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
@@ -76,28 +76,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 *&cobj);
   // Decrement reference count on cached object, perhaps delete.
   // Returns 0 if only decremented, 1 if deleted, -1 if error.
 
@@ -106,12 +106,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 +121,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 *&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_;
@@ -148,20 +148,20 @@ private:
 
 
 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);
+  virtual ~ACE_Cache_Proxy (void);
 
   DATA *data (void) const;
   operator DATA * (void) const;
@@ -170,7 +170,7 @@ public:
 
 private:
 
-  JAWS_Cache_Object *object_;
+  ACE_Cache_Object *object_;
   Cache_Manager *manager_;
 
 
@@ -182,4 +182,4 @@ private:
 #include "JAWS/Cache_Manager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_CACHE_MANAGER_T_H */
+#endif /* ACE_CACHE_MANAGER_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp
index abb582aa9c7..846a415b60b 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp
@@ -2,7 +2,7 @@
 
 #include "JAWS/Cache_Object.h"
 
-JAWS_Cache_Object::JAWS_Cache_Object (const void *data, size_t size)
+ACE_Cache_Object::ACE_Cache_Object (const void *data, size_t size)
   : internal_ (0),
     data_ (data),
     size_ (size)
@@ -11,109 +11,109 @@ JAWS_Cache_Object::JAWS_Cache_Object (const void *data, size_t size)
   this->new_last_access_ = this->last_access_ = this->first_access_;
 }
 
-JAWS_Cache_Object::~JAWS_Cache_Object ()
+ACE_Cache_Object::~ACE_Cache_Object ()
 {
   this->data_ = 0;
   this->size_ = 0;
 }
 
 void *
-JAWS_Cache_Object::internal (void) const
+ACE_Cache_Object::internal (void) const
 {
   return this->internal_;
 }
 
 void
-JAWS_Cache_Object::internal (void *item)
+ACE_Cache_Object::internal (void *item)
 {
   this->internal_ = item;
 }
 
 const void *
-JAWS_Cache_Object::data (void) const
+ACE_Cache_Object::data (void) const
 {
   return this->data_;
 }
 
 size_t
-JAWS_Cache_Object::size (void) const
+ACE_Cache_Object::size (void) const
 {
   return this->size_;
 }
 
 unsigned int
-JAWS_Cache_Object::count (void) const
+ACE_Cache_Object::count (void) const
 {
   return this->count_i ();
 }
 
 int
-JAWS_Cache_Object::acquire (void)
+ACE_Cache_Object::acquire (void)
 {
   this->new_last_access_ = ACE_OS::time ((time_t *)0);
   return this->acquire_i ();
 }
 
 int
-JAWS_Cache_Object::release (void)
+ACE_Cache_Object::release (void)
 {
   this->last_access_ = this->new_last_access_;
   return this->release_i ();
 }
 
 time_t
-JAWS_Cache_Object::last_access (void) const
+ACE_Cache_Object::last_access (void) const
 {
   return this->last_access_;
 }
 
 time_t
-JAWS_Cache_Object::first_access (void) const
+ACE_Cache_Object::first_access (void) const
 {
   return this->first_access_;
 }
 
 unsigned int
-JAWS_Cache_Object::priority (void) const
+ACE_Cache_Object::priority (void) const
 {
   return this->priority_i ();
 }
 
 void *
-JAWS_Cache_Object::heap_item (void) const
+ACE_Cache_Object::heap_item (void) const
 {
   return this->heap_item_;
 }
 
 void
-JAWS_Cache_Object::heap_item (void *item)
+ACE_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),
+ACE_Referenced_Cache_Object::
+ACE_Referenced_Cache_Object (const void *data, size_t size)
+  : ACE_Cache_Object (data, size),
     lock_adapter_ (count_)
 {
 }
 
-JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object (void)
+ACE_Referenced_Cache_Object::~ACE_Referenced_Cache_Object (void)
 {
 }
 
 ACE_Lock &
-JAWS_Referenced_Cache_Object::lock (void)
+ACE_Referenced_Cache_Object::lock (void)
 {
   return this->lock_adapter_;
 }
 
 unsigned int
-JAWS_Referenced_Cache_Object::count_i (void) const
+ACE_Referenced_Cache_Object::count_i (void) const
 {
-  JAWS_Referenced_Cache_Object *mutable_this
-    = (JAWS_Referenced_Cache_Object *) this;
+  ACE_Referenced_Cache_Object *mutable_this
+    = (ACE_Referenced_Cache_Object *) this;
 
   if (mutable_this->count_.tryacquire_write () == 0)
     return 0;
@@ -122,19 +122,19 @@ JAWS_Referenced_Cache_Object::count_i (void) const
 }
 
 int
-JAWS_Referenced_Cache_Object::acquire_i (void)
+ACE_Referenced_Cache_Object::acquire_i (void)
 {
   return this->count_.acquire_read ();
 }
 
 int
-JAWS_Referenced_Cache_Object::release_i (void)
+ACE_Referenced_Cache_Object::release_i (void)
 {
   return this->count_.release ();
 }
 
 unsigned int
-JAWS_Referenced_Cache_Object::priority_i (void) const
+ACE_Referenced_Cache_Object::priority_i (void) const
 {
   unsigned int priority = ~(0U);
   double delta
@@ -148,29 +148,29 @@ JAWS_Referenced_Cache_Object::priority_i (void) const
 
 
 
-JAWS_Counted_Cache_Object::
-JAWS_Counted_Cache_Object (const void *data, size_t size)
-  : JAWS_Cache_Object (data, size),
+ACE_Counted_Cache_Object::
+ACE_Counted_Cache_Object (const void *data, size_t size)
+  : ACE_Cache_Object (data, size),
     count_ (0),
     new_count_ (0),
     lock_adapter_ (lock_)
 {
 }
 
-JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object (void)
+ACE_Counted_Cache_Object::~ACE_Counted_Cache_Object (void)
 {
 }
 
 ACE_Lock &
-JAWS_Counted_Cache_Object::lock (void)
+ACE_Counted_Cache_Object::lock (void)
 {
   return this->lock_adapter_;
 }
 
 unsigned int
-JAWS_Counted_Cache_Object::count_i (void) const
+ACE_Counted_Cache_Object::count_i (void) const
 {
-  JAWS_Counted_Cache_Object *mutable_this = (JAWS_Counted_Cache_Object *) this;
+  ACE_Counted_Cache_Object *mutable_this = (ACE_Counted_Cache_Object *) this;
 
   {
     ACE_Guard<ACE_SYNCH_MUTEX> g (mutable_this->lock_);
@@ -180,7 +180,7 @@ JAWS_Counted_Cache_Object::count_i (void) const
 }
 
 int
-JAWS_Counted_Cache_Object::acquire_i (void)
+ACE_Counted_Cache_Object::acquire_i (void)
 {
   ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
 
@@ -189,7 +189,7 @@ JAWS_Counted_Cache_Object::acquire_i (void)
 }
 
 int
-JAWS_Counted_Cache_Object::release_i (void)
+ACE_Counted_Cache_Object::release_i (void)
 {
   ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
 
@@ -199,24 +199,24 @@ JAWS_Counted_Cache_Object::release_i (void)
 }
 
 unsigned int
-JAWS_Counted_Cache_Object::priority_i (void) const
+ACE_Counted_Cache_Object::priority_i (void) const
 {
   return this->count_i ();
 }
 
-JAWS_Cache_Object_Factory::JAWS_Cache_Object_Factory (ACE_Allocator *alloc)
+ACE_Cache_Object_Factory::ACE_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)
+ACE_Cache_Object_Factory::~ACE_Cache_Object_Factory (void)
 {
 }
 
 int
-JAWS_Cache_Object_Factory::open (ACE_Allocator *alloc)
+ACE_Cache_Object_Factory::open (ACE_Allocator *alloc)
 {
   this->allocator_ = alloc;
 
@@ -226,68 +226,68 @@ JAWS_Cache_Object_Factory::open (ACE_Allocator *alloc)
   return 0;
 }
 
-JAWS_Referenced_Cache_Object_Factory
-::JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc)
-  : JAWS_Cache_Object_Factory (alloc)
+ACE_Referenced_Cache_Object_Factory
+::ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc)
+  : ACE_Cache_Object_Factory (alloc)
 {
 }
 
-JAWS_Referenced_Cache_Object_Factory
-::~JAWS_Referenced_Cache_Object_Factory (void)
+ACE_Referenced_Cache_Object_Factory
+::~ACE_Referenced_Cache_Object_Factory (void)
 {
 }
 
-JAWS_Cache_Object *
-JAWS_Referenced_Cache_Object_Factory::create (const void *data, size_t size)
+ACE_Cache_Object *
+ACE_Referenced_Cache_Object_Factory::create (const void *data, size_t size)
 {
-  JAWS_Referenced_Cache_Object *obj;
+  ACE_Referenced_Cache_Object *obj;
 
-  size_t obj_size = sizeof (JAWS_Referenced_Cache_Object);
+  size_t obj_size = sizeof (ACE_Referenced_Cache_Object);
   ACE_NEW_MALLOC_RETURN (obj,
-                         (JAWS_Referenced_Cache_Object *)
+                         (ACE_Referenced_Cache_Object *)
                          this->allocator_->malloc (obj_size),
-                         JAWS_Referenced_Cache_Object (data, size), 0);
+                         ACE_Referenced_Cache_Object (data, size), 0);
 
   return obj;
 }
 
 void
-JAWS_Referenced_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj)
+ACE_Referenced_Cache_Object_Factory::destroy (ACE_Cache_Object *obj)
 {
-  JAWS_Referenced_Cache_Object *rco = (JAWS_Referenced_Cache_Object *) obj;
-  ACE_DES_FREE (rco, this->allocator_->free, JAWS_Referenced_Cache_Object);
+  ACE_Referenced_Cache_Object *rco = (ACE_Referenced_Cache_Object *) obj;
+  ACE_DES_FREE (rco, this->allocator_->free, ACE_Referenced_Cache_Object);
 }
 
-JAWS_Counted_Cache_Object_Factory
-::JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc)
-  : JAWS_Cache_Object_Factory (alloc)
+ACE_Counted_Cache_Object_Factory
+::ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc)
+  : ACE_Cache_Object_Factory (alloc)
 {
 }
 
-JAWS_Counted_Cache_Object_Factory
-::~JAWS_Counted_Cache_Object_Factory (void)
+ACE_Counted_Cache_Object_Factory
+::~ACE_Counted_Cache_Object_Factory (void)
 {
 }
 
-JAWS_Cache_Object *
-JAWS_Counted_Cache_Object_Factory::create (const void *data, size_t size)
+ACE_Cache_Object *
+ACE_Counted_Cache_Object_Factory::create (const void *data, size_t size)
 {
-  JAWS_Counted_Cache_Object *obj;
+  ACE_Counted_Cache_Object *obj;
 
-  size_t obj_size = sizeof (JAWS_Counted_Cache_Object);
+  size_t obj_size = sizeof (ACE_Counted_Cache_Object);
   ACE_NEW_MALLOC_RETURN (obj,
-                         (JAWS_Counted_Cache_Object *)
+                         (ACE_Counted_Cache_Object *)
                          this->allocator_->malloc (obj_size),
-                         JAWS_Counted_Cache_Object (data, size), 0);
+                         ACE_Counted_Cache_Object (data, size), 0);
 
   return obj;
 }
 
 void
-JAWS_Counted_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj)
+ACE_Counted_Cache_Object_Factory::destroy (ACE_Cache_Object *obj)
 {
-  JAWS_Counted_Cache_Object *cco = (JAWS_Counted_Cache_Object *) obj;
-  ACE_DES_FREE (cco, this->allocator_->free, JAWS_Counted_Cache_Object);
+  ACE_Counted_Cache_Object *cco = (ACE_Counted_Cache_Object *) obj;
+  ACE_DES_FREE (cco, this->allocator_->free, ACE_Counted_Cache_Object);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h
index fbd570b4140..86267940c78 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h
@@ -2,8 +2,8 @@
 // $Id$
 
 
-#ifndef JAWS_CACHE_OBJECT_H
-#define JAWS_CACHE_OBJECT_H
+#ifndef ACE_CACHE_OBJECT_H
+#define ACE_CACHE_OBJECT_H
 
 #include "ace/OS.h"
 #include "ace/Synch.h"
@@ -11,11 +11,11 @@
 
 // Cache bucket -- use Hash_Bucket to hold cacheable objects.
 
-class JAWS_Cache_Object
+class ACE_Cache_Object
 {
 public:
-  JAWS_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Cache_Object (void);
+  ACE_Cache_Object (const void *, size_t);
+  virtual ~ACE_Cache_Object (void);
 
   void *internal (void) const;
   void internal (void *);
@@ -60,11 +60,11 @@ private:
 
 };
 
-class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object
+class ACE_Referenced_Cache_Object : public ACE_Cache_Object
 {
 public:
-  JAWS_Referenced_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Referenced_Cache_Object (void);
+  ACE_Referenced_Cache_Object (const void *, size_t);
+  virtual ~ACE_Referenced_Cache_Object (void);
 
   virtual ACE_Lock & lock (void);
 
@@ -82,11 +82,11 @@ private:
   
 };
 
-class JAWS_Counted_Cache_Object : public JAWS_Cache_Object
+class ACE_Counted_Cache_Object : public ACE_Cache_Object
 {
 public:
-  JAWS_Counted_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Counted_Cache_Object (void);
+  ACE_Counted_Cache_Object (const void *, size_t);
+  virtual ~ACE_Counted_Cache_Object (void);
 
   virtual ACE_Lock & lock (void);
 
@@ -106,17 +106,17 @@ private:
 
 };
 
-class JAWS_Cache_Object_Factory
+class ACE_Cache_Object_Factory
 {
 public:
 
-  JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Cache_Object_Factory (void);
+  ACE_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_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;
+  virtual ACE_Cache_Object * create (const void *, size_t) = 0;
+  virtual void destroy (ACE_Cache_Object *) = 0;
 
 protected:
 
@@ -124,26 +124,26 @@ protected:
 
 };
 
-class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory
+class ACE_Referenced_Cache_Object_Factory : public ACE_Cache_Object_Factory
 {
 public:
-  JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Referenced_Cache_Object_Factory (void);
+  ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_Referenced_Cache_Object_Factory (void);
 
-  virtual JAWS_Cache_Object * create (const void *, size_t);
-  virtual void destroy (JAWS_Cache_Object *);
+  virtual ACE_Cache_Object * create (const void *, size_t);
+  virtual void destroy (ACE_Cache_Object *);
 
 };
 
-class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory
+class ACE_Counted_Cache_Object_Factory : public ACE_Cache_Object_Factory
 {
 public:
-  JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Counted_Cache_Object_Factory (void);
+  ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_Counted_Cache_Object_Factory (void);
 
-  virtual JAWS_Cache_Object * create (const void *, size_t);
-  virtual void destroy (JAWS_Cache_Object *);
+  virtual ACE_Cache_Object * create (const void *, size_t);
+  virtual void destroy (ACE_Cache_Object *);
 
 };
 
-#endif /* JAWS_CACHE_OBJECT_H */
+#endif /* UTL_CACHE_OBJECT_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp
index f498ce12681..b7c0cb8c93a 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp
@@ -1,7 +1,7 @@
 // $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"
 
@@ -10,10 +10,10 @@
 // -----------------
 
 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 +22,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 +43,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 +54,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)
     {
@@ -100,10 +100,10 @@ push (const EXT_ID &ext_id, const INT_ID &int_id)
   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 +126,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;
 
@@ -163,7 +163,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 +178,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 +188,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 +204,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 +231,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 +252,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 +263,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 +282,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 +301,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)
   : dlcstack_ (alloc)
 {
   if (alloc == 0)
@@ -310,7 +310,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 +320,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 +351,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 +367,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 +375,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 +394,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 +413,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 +436,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 +453,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/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h
index 9a394a2b42d..d12c11db2e4 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/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,13 +188,13 @@ 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_;
 
 };
 
@@ -203,4 +203,4 @@ private:
 #include "JAWS/Hash_Bucket_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_HASH_BUCKET_T_H */
+#endif /* ACE_HASH_BUCKET_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
index 67710d0f543..c02b7ababff 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
@@ -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..fd2632e94f0 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile
+++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile
@@ -21,13 +21,12 @@ MYFILES  	= \
         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 \
@@ -81,33 +80,38 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Cache_Hash_T.o .obj/Cache_Hash_T.so .shobj/Cache_Hash_T.o .shobj/Cache_Hash_T.so: Cache_Hash_T.cpp ../JAWS/Cache_Hash_T.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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/Cache_Object.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -129,18 +133,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Hash_T.cpp \
- ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
+ ../JAWS/Hash_Bucket_T.cpp
 .obj/Cache_Heap_T.o .obj/Cache_Heap_T.so .shobj/Cache_Heap_T.o .shobj/Cache_Heap_T.so: Cache_Heap_T.cpp ../JAWS/Cache_Heap_T.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -156,11 +163,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 \
@@ -183,23 +192,28 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \
- ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_Manager_T.h \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ ../JAWS/Cache_Object.h ../JAWS/Cache_Heap_T.cpp \
+ ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \
- ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
- ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
+ ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
+ ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_List_T.h \
+ ../JAWS/Cache_List_T.cpp
 .obj/Cache_List_T.o .obj/Cache_List_T.so .shobj/Cache_List_T.o .shobj/Cache_List_T.so: Cache_List_T.cpp ../JAWS/Cache_List_T.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -215,11 +229,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 \
@@ -242,24 +258,30 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \
- ../JAWS/Cache_List_T.cpp ../JAWS/Cache_Manager_T.h \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ ../JAWS/Cache_Object.h ../JAWS/Cache_List_T.cpp \
+ ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \
- ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
- ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
-.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
+ ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
+ ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \
+ ../JAWS/Cache_Heap_T.cpp
+.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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 \
@@ -270,22 +292,26 @@ 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 ../JAWS/Cache_Manager.h \
- ../JAWS/Cache_Manager_T.h $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ ../JAWS/Cache_Manager.h ../JAWS/Cache_Manager_T.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Cache_Object.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.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 \
@@ -302,21 +328,25 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \
- ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
- ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp \
- ../JAWS/Cache_List_T.h ../JAWS/Cache_List_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
+ ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
+ ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \
+ ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_List_T.h \
+ ../JAWS/Cache_List_T.cpp
 .obj/Cache_Manager_T.o .obj/Cache_Manager_T.so .shobj/Cache_Manager_T.o .shobj/Cache_Manager_T.so: Cache_Manager_T.cpp ../JAWS/Cache_Manager_T.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -329,11 +359,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 \
@@ -342,8 +374,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/Cache_Object.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -360,21 +393,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \
- ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \
- ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \
+ ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \
+ ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \
+ ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_List_T.h \
+ ../JAWS/Cache_List_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/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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 \
@@ -385,14 +423,17 @@ 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/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -416,17 +457,20 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
 .obj/Hash_Bucket_T.o .obj/Hash_Bucket_T.so .shobj/Hash_Bucket_T.o .shobj/Hash_Bucket_T.so: Hash_Bucket_T.cpp ../JAWS/Hash_Bucket_T.h \
- $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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 \
@@ -436,18 +480,21 @@ 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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_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 \
@@ -456,7 +503,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 \
@@ -464,135 +512,187 @@ 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/Memory_Pool.i \
+ ../JAWS/Hash_Bucket_T.cpp
+.obj/Headers.o .obj/Headers.so .shobj/Headers.o .shobj/Headers.so: Headers.cpp ../JAWS/Headers.h ../JAWS/Export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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/Pipeline.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/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_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/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/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/Signal.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.h \
+ $(ACE_ROOT)/ace/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/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/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/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/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 ../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 \
+ ../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.h \
+ $(ACE_ROOT)/ace/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 ../JAWS/Waiter.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 \
+ ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp ../JAWS/Export.h \
+ ../JAWS/IO_Handler.h $(ACE_ROOT)/ace/Asynch_IO.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/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -605,25 +705,35 @@ 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/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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -631,15 +741,27 @@ 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/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 \
@@ -651,25 +773,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 \
- $(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 \
@@ -690,26 +795,48 @@ 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/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(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/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-sunos5.5.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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -718,38 +845,19 @@ 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/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 +869,8 @@ 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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -773,6 +882,11 @@ 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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -792,7 +906,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -823,7 +938,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,225 +948,53 @@ 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/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-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/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/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/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/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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/Asynch_IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.i \
- $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
- $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/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/Timer_Queue.h \
- $(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/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/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/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/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_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 \
@@ -1060,18 +1004,20 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task.h \
+ ../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 \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1079,25 +1025,10 @@ 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/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/Signal.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1109,8 +1040,26 @@ 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 \
@@ -1131,43 +1080,32 @@ 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.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/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
+ $(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/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-sunos5.5.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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -1176,18 +1114,21 @@ 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/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1214,8 +1155,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ ../JAWS/Export.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -1234,7 +1176,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 \
@@ -1265,7 +1208,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 +1218,21 @@ 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,15 +1240,17 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: Policy.cpp ../JAWS/Policy.h ../JAWS/Export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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 \
@@ -1313,11 +1262,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 \
@@ -1338,7 +1289,8 @@ 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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1346,12 +1298,14 @@ 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 \
@@ -1400,25 +1354,27 @@ 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/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/Asynch_Acceptor.i \
- $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
+ ../JAWS/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.h \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -1426,15 +1382,17 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp
 .obj/Concurrency.o .obj/Concurrency.so .shobj/Concurrency.o .shobj/Concurrency.so: Concurrency.cpp ../JAWS/JAWS.h ../JAWS/Concurrency.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -1447,11 +1405,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 \
@@ -1472,7 +1432,8 @@ 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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1480,12 +1441,14 @@ 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 \
@@ -1534,18 +1497,22 @@ 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/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ ../JAWS/Export.h ../JAWS/IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_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 \
@@ -1553,19 +1520,22 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  ../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-sunos5.5.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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -1574,20 +1544,24 @@ 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 ../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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_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 \
@@ -1614,7 +1588,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ ../JAWS/Pipeline.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1634,7 +1609,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 \
@@ -1665,7 +1641,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,25 +1651,27 @@ 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/Asynch_Acceptor.i \
- $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
+ ../JAWS/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.h \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -1700,14 +1679,16 @@ 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-sunos5.5.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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -1716,18 +1697,21 @@ 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/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -1754,8 +1738,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ ../JAWS/Export.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -1774,7 +1759,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 \
@@ -1805,7 +1791,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,70 +1801,90 @@ 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/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/Addr.h \
+ $(ACE_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/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \
- ../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 \
+ $(ACE_ROOT)/ace/Asynch_IO.h ../JAWS/IO_Handler.h
+.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp \
+ $(ACE_ROOT)/ace/Proactor.h \
  $(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/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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Filecache.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/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.i \
+ $(ACE_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.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,60 +1892,33 @@ 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/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/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Proactor.i \
- $(ACE_ROOT)/ace/Filecache.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/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 \
+ ../JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/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 \
@@ -1948,21 +1928,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Export.h \
  ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \
  $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/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/Data_Block.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/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp ../JAWS/Data_Block.h \
  ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -1971,6 +1951,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1981,7 +1963,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 \
@@ -1990,18 +1973,21 @@ 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 \
- ../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-sunos5.5.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/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -2010,18 +1996,21 @@ 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/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -2050,10 +2039,13 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
@@ -2089,7 +2081,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 \
@@ -2110,7 +2103,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,16 +2113,15 @@ 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_Acceptor.i \
- $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \
+ $(ACE_ROOT)/ace/Asynch_IO.h ../JAWS/IO_Handler.h \
+ ../JAWS/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.h \
  $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
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/server/Makefile b/apps/JAWS/server/Makefile
index 2bd79c0343f..1f0efe415bc 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -24,7 +24,6 @@ FILES  	= \
 	Parse_Headers \
 	IO
 
-LIBS   += $(ACELIB)
 LDLIBS	= -lJAWS
 
 PSRC   	= $(addsuffix .cpp,$(BIN))
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/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/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/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/auto_compile_win32.pl b/bin/auto_compile_win32.pl
index 768dc18c863..7271d483515 100755
--- a/bin/auto_compile_win32.pl
+++ b/bin/auto_compile_win32.pl
@@ -33,7 +33,7 @@
 
 %Win32_DLL_Collections = ( "$Win32_Lists[0]" => <<EOD , # Debug
 ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
+apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
@@ -53,10 +53,11 @@ 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:
+tests/tests.dsw, ALL:
 EOD
                      "$Win32_Lists[1]" => <<EOD , # Release
 ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
+apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
@@ -87,7 +88,7 @@ EOD
 
 %Alpha_DLL_Collections = ( "$Alpha_Lists[0]" => <<EOD , # Debug
 ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
+apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
@@ -98,7 +99,7 @@ tests/tests.dsw, ALL:
 EOD
                      "$Alpha_Lists[1]" => <<EOD , # Release
 ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
+apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
@@ -148,68 +149,6 @@ 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;
@@ -250,36 +189,6 @@ sub Build_Config
     }
 }
 
-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 );
@@ -289,7 +198,6 @@ sub Build_Collection
         $Config = $Lists[$Cntr];
         print "Building $Config of $Target{$Config}\n" if ( $Debug );
         Build_Config ($Config, $Target{$Config});
-        Build_Version_Test ($Config);
     }
 }
 
@@ -327,12 +235,12 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ )
     }
     elsif ( $ARGV[0] eq '-D' )  # Build DLL only
     {
-        print "Build DLL only\n" if ( $Verbose );
+        print "Build DLL only" if ( $Verbose );
         $Build_LIB = 0;
     }
     elsif ( $ARGV[0] eq '-L' )  # Build LIB only
     {
-        print "Build LIB only\n" if ( $Verbose );
+        print "Build LIB only" if ( $Verbose );
         $Build_DLL = 0;
     }
     elsif ( $ARGV[0] eq '-v' )   # Verbose mode
diff --git a/bin/bootstrap b/bin/autogen
index c8157c058ec..c8157c058ec 100755
--- a/bin/bootstrap
+++ b/bin/autogen
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/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/vc_filter.pl b/bin/vc_filter.pl
index 3b3946632e8..62cda10bfd1 100755
--- a/bin/vc_filter.pl
+++ b/bin/vc_filter.pl
@@ -43,11 +43,9 @@ while ($line = <fp>)
     }
 
     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 : / ||
+        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 : /);
 
 }
diff --git a/configure.in b/configure.in
index bdc03b11319..378f690df62 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl
 dnl $Id$
 
-AC_REVISION($Revision 0.60 $)dnl
+AC_REVISION($Revision 0.59 $)dnl
 
 dnl
 dnl An autoconf script to automatically configure ACE.
@@ -933,20 +933,12 @@ dnl if the libtool setup was done prior to the thread checks.
 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 Tell libtool to build a C++ shared library
+dnl AC_LIBTOOL_BUILD_CXX_LIBRARY
 
 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
 dnl
@@ -1078,7 +1070,6 @@ AC_CHECK_HEADER(sys/procfs.h, dnl
      [
      ],
      [
-      dnl If ace_has_procfs_conflict = no then define ACE_HAS_PROC_FS.
       AC_DEFINE(ACE_HAS_PROC_FS)
      ])
   ],)
@@ -2238,56 +2229,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,
@@ -3536,8 +3477,7 @@ 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),
@@ -5548,28 +5488,6 @@ ACE_CACHE_CHECK(for MAP_FAILED constant,
      ])
   ],)
 
-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_tcp_nodelay=no
-      ])
-  ], , AC_DEFINE(ACE_LACKS_TCP_NODELAY))
-
 dnl Check if platform supports SO_SNDBUF/SO_RCVBUF socket options
 ACE_CACHE_CHECK(for SO_SNDBUF/SO_RCVBUF socket options,
   ace_cv_feature_so_sndbuf_rcvbuf,[
@@ -5581,8 +5499,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
       ],
       [
@@ -6009,97 +5927,6 @@ dnl        the UNIX International threads library was detected.
   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
@@ -6537,6 +6364,7 @@ AC_OUTPUT([
            netsvcs/lib/Makefile
            netsvcs/servers/Makefile
            tests/Makefile
+           tests/log/Makefile
           ])
 
 dnl Make sure ace-diff-config is executable
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-guidelines.html b/docs/ACE-guidelines.html
index 62cf5cc69ba..0de2ca1a752 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -140,21 +140,16 @@ bgcolor="#ffffff">
         #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>
+    <li>Be very careful with names of macros and enum values.  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>
+        <code>ERROR</code>, and so on.<p>
 
     <li>Try to centralize <code>#ifdefs</code> with <code>typedefs</code>
         and <code>#defines</code>.  For example, use this:
diff --git a/docs/exceptions.html b/docs/exceptions.html
index 0994d75aff4..82d4f6e0978 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -4,29 +4,24 @@
 <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 text="#000000" link="#0000ff" vlink="#cc0000" bgcolor="#ffffff">
+    <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>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>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>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>
 
-<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>
@@ -66,7 +61,7 @@ try macros.
       exceptions from functions it called.  By default, ACE try macros
       assumes that the variable is named <code>ACE_TRY_ENV</code>.
       <code>ACE_TRY_ENV</code> itself is also a macro which can be
-      redefined.
+      redefined.  
       </pre>
 
       <P>
@@ -82,14 +77,14 @@ try macros.
       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>
+      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>
@@ -173,7 +168,7 @@ try macros.
         <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
+            at the end of this TRY block ie. after 
             <code>ACE_ENDTRY</code>.
             </p>
         </LI>
@@ -340,7 +335,7 @@ macros discussed here.
         {
           // 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);
diff --git a/docs/tutorials/017/Barrier_i.cpp b/docs/tutorials/017/Barrier_i.cpp
index 0d9f0c67398..c8d0c6ba5ed 100644
--- a/docs/tutorials/017/Barrier_i.cpp
+++ b/docs/tutorials/017/Barrier_i.cpp
@@ -152,9 +152,3 @@ int Barrier::make_barrier( int _wait )
 
     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/018/token.cpp b/docs/tutorials/018/token.cpp
index 1323dcaa9b4..771c19988e1 100644
--- a/docs/tutorials/018/token.cpp
+++ b/docs/tutorials/018/token.cpp
@@ -17,16 +17,3 @@ int main(int,char**)
     
     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/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/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile
index f58eda27196..2e3827415f7 100644
--- a/examples/Connection/non_blocking/Makefile
+++ b/examples/Connection/non_blocking/Makefile
@@ -948,11 +948,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
  CPP-connector.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -1093,13 +1090,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
  CPP-acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
diff --git a/examples/DLL/test_dll.cpp b/examples/DLL/test_dll.cpp
index 45df35c4f87..cbae44b4e0a 100644
--- a/examples/DLL/test_dll.cpp
+++ b/examples/DLL/test_dll.cpp
@@ -10,8 +10,8 @@
 ACE_RCSID(DLL, test_dll, "$Id$")
 
 typedef Magazine* (*Magazine_Creator) (void);
-
-int
+  
+int 
 main (int argc, char *argv[])
 {
   ACE_UNUSED_ARG (argc);
@@ -36,13 +36,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 +52,7 @@ main (int argc, char *argv[])
                        "%s",
                        dll.error ()),
                       -1);
-
+  
   mc = (Magazine_Creator) dll.symbol ("create_magazine");
 
   if (mc == 0)
@@ -61,14 +61,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 +76,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/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 7b935dbb983..7a98c2f1bd6 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.
 };
 
@@ -122,7 +120,7 @@ Options::Options (void)
     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)
+#if defined (ACE_MT_SAFE)
     , barrier_ (0)
 #endif /* ACE_MT_SAFE */
 {
@@ -133,7 +131,7 @@ Options::~Options (void)
   ACE_MT (delete this->barrier_);
   delete [] this->message_buf_;
 }
-
+  
 // Options Singleton.
 typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
 
@@ -302,7 +300,7 @@ 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 ());
   return buf;
@@ -438,9 +436,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.
diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile
index 0f229d640c4..e69b62f51d0 100644
--- a/examples/IPC_SAP/SPIPE_SAP/Makefile
+++ b/examples/IPC_SAP/SPIPE_SAP/Makefile
@@ -72,8 +72,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Connector.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -101,8 +100,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
 .obj/consumer_msg.o .obj/consumer_msg.so .shobj/consumer_msg.o .shobj/consumer_msg.so: consumer_msg.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -130,8 +128,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
 .obj/consumer_read.o .obj/consumer_read.so .shobj/consumer_read.o .shobj/consumer_read.so: consumer_read.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -159,8 +156,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
 .obj/producer_msg.o .obj/producer_msg.so .shobj/producer_msg.o .shobj/producer_msg.so: producer_msg.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -189,8 +185,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Connector.i
 .obj/producer_read.o .obj/producer_read.so .shobj/producer_read.o .shobj/producer_read.so: producer_read.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -219,8 +214,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i \
- shared.h
+ $(ACE_ROOT)/ace/SPIPE_Connector.i
 .obj/NPClient.o .obj/NPClient.so .shobj/NPClient.o .shobj/NPClient.so: NPClient.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
index a9fe506d555..764ee8e6c52 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
@@ -13,44 +13,18 @@ int main (int argc, char *argv[])
 {
   if (argc < 2)
     ACE_ERROR_RETURN ((LM_ERROR, 
-                       "Usage: %s hostname [-s selector] [QoS in KB/sec]\n",
+                       "Usage: %s hostname [QoS in KB/sec] [timeout]\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;
+  int qos = argc > 2 ? ACE_OS::atoi (argv[2]) : 0;
+  int timeout = argc > 3 ? ACE_OS::atoi (argv[3]) : 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);
@@ -58,7 +32,7 @@ int main (int argc, char *argv[])
   // 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)
+  if (cli_stream.open (ACE_TLI_TCP_DEVICE, O_RDWR, 0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "open failed"),
@@ -81,15 +55,16 @@ int main (int argc, char *argv[])
   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()
+  // 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,
+                   (ACE_Time_Value *) &ACE_Time_Value::zero, 
                    local_addr,
                    1,
                    O_RDWR,
                    0,
-                   ACE_XTI_ATM_DEVICE,
+                   ACE_TLI_TCP_DEVICE,
                    0,
                    1,
                    0,
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
index 7bc73e5b702..8e3e13286b8 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
@@ -11,43 +11,17 @@ ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$")
 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
+  ACE_Time_Value timeout (argc > 1 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT);
 
   // 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)
+  if (peer_acceptor.open (addr, 1) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "open"),
@@ -65,7 +39,7 @@ main (int argc, char *argv[])
   for (;;) 
     {
       char buf[BUFSIZ];                                          
-
+                                                                     
       // Create a new ACE_TLI_Stream endpoint (note automatic restart
       // if errno == EINTR).
       if (peer_acceptor.accept (new_stream, 
@@ -77,7 +51,7 @@ main (int argc, char *argv[])
                       "accept"));
 	  continue;
 	}          
-
+                                                                 
       ACE_DEBUG ((LM_DEBUG,
                   "client %s connected\n",
                   addr.addr_to_string ()));
@@ -85,7 +59,7 @@ main (int argc, char *argv[])
       // Read data from client (terminate on error).
 
       for (int r_bytes; 
-	   (r_bytes = new_stream.recv (buf, sizeof buf, 0)) > 0; )
+	   (r_bytes = new_stream.recv (buf, sizeof buf)) > 0; )
         if (ACE_OS::write (ACE_STDOUT,
                            buf,
                            r_bytes) != r_bytes)
diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile
index 58ec52914a3..5f325491a08 100644
--- a/examples/IPC_SAP/TLI_SAP/Makefile
+++ b/examples/IPC_SAP/TLI_SAP/Makefile
@@ -71,11 +71,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/INET_Addr.i
 .obj/ftp-server.o .obj/ftp-server.so .shobj/ftp-server.o .shobj/ftp-server.so: ftp-server.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread.h \
@@ -139,13 +136,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/INET_Addr.i
 .obj/db-client.o .obj/db-client.so .shobj/db-client.o .shobj/db-client.so: db-client.cpp \
  $(ACE_ROOT)/ace/TLI_Connector.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
@@ -170,11 +164,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/INET_Addr.i
 .obj/db-server.o .obj/db-server.so .shobj/db-server.o .shobj/db-server.so: db-server.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -198,13 +189,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
@@ -269,11 +257,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/INET_Addr.i
 .obj/CPP-server.o .obj/CPP-server.so .shobj/CPP-server.o .shobj/CPP-server.so: CPP-server.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -297,75 +282,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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
-.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
+ $(ACE_ROOT)/ace/INET_Addr.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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/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/Naming/Makefile b/examples/Naming/Makefile
index e6cbd82be6b..5a3391db4b4 100644
--- a/examples/Naming/Makefile
+++ b/examples/Naming/Makefile
@@ -8,26 +8,27 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
+BIN = test_non_existent \
+      test_writers \
+      test_multiple_contexts
+
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 PSRC    = $(addsuffix .cpp,$(BIN))
 
-BIN2 = test_non_existent \
-       test_writers \
-       test_multiple_contexts
-
-#### 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
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+#### If the ACE library wasn't built with the Other component, don't
+#### try to build the clients.
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
+ifeq (,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
+  BIN =
+endif # ! Other
+
 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/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile
index 6217f6639c9..9f7880fd03f 100644
--- a/examples/Reactor/Misc/Makefile
+++ b/examples/Reactor/Misc/Makefile
@@ -322,7 +322,9 @@ 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/Event_Handler.i
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Event_Handler_T.i \
+ $(ACE_ROOT)/ace/Event_Handler_T.cpp
 .obj/test_reactors.o .obj/test_reactors.so .shobj/test_reactors.o .shobj/test_reactors.so: test_reactors.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
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/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..3932260c930 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 test_aiosig_ace
+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
index 6509e3efcb4..fa873589773 100644
--- a/examples/Reactor/Proactor/README
+++ b/examples/Reactor/Proactor/README
@@ -1,10 +1,9 @@
-This README file lists all the example applications for the Proactor framework. 
+This file describes the behavior of the POSIX <aio_> calls on the
+various platforms it is being tested on.
 
-Test/Example Applications for Proactor:
-=========================================
+Test Suits:
+==========
 
-The following tests are available.
-        
 o $ACE_ROOT/tests/Aio_Platform_Test.cpp : Tests basic limits
         pertaining to the  POSIX features 
 
@@ -17,58 +16,23 @@ 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 $ACE_ROOT/examples/Reactor/Proactor/test_aiosig_ace.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)
+        completions strategy Proactor. (#define ACE_POSIX_AIOCB_PROACTOR)
 
 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.
+        strategy proactor. (#define ACE_POSIX_SIG_PROACTOR)
 
 
 
 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:
 ================
 
@@ -178,3 +142,5 @@ Lynx g++:
           
         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_completion.dsp b/examples/Reactor/Proactor/post_completion.dsp
deleted file mode 100644
index b736965277c..00000000000
--- a/examples/Reactor/Proactor/post_completion.dsp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="post_completion" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=post_completion - 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 

-!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 

-!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 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "post_completion - 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)" == "post_completion - 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 /MTd /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 /out:"post_completion.exe" /pdbtype:sept /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "post_completion - Win32 Release"

-# Name "post_completion - Win32 Debug"

-# Begin Source File

-

-SOURCE=..\post_completions.cpp

-# End Source File

-# End Target

-# End Project

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
index 008121b744a..3bd3ee96b3d 100644
--- a/examples/Reactor/Proactor/test_aiocb.cpp
+++ b/examples/Reactor/Proactor/test_aiocb.cpp
@@ -9,8 +9,14 @@
 //    test_aiocb.cpp
 //
 // = DESCRIPTION
-//    Checkout $ACE_ROOT/examples/Reactor/Proactor/test_aiocb_ace.cpp,
-//    which is the ACE'ified version of this program. 
+//    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. use $ACE_ROOT/tests for this.
+//    This is for testing 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
 //    % CC -g -o test_aiocb -lrt test_aiocb.cpp
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
index 1746a10a49c..ff4c257af84 100644
--- a/examples/Reactor/Proactor/test_aiosig.cpp
+++ b/examples/Reactor/Proactor/test_aiosig.cpp
@@ -5,11 +5,26 @@
 //     test_aiosig.cpp
 //
 // = DESCRITPTION
-//     Check out test_aiosig_ace.cpp, the ACE'ified version of this
-//     program. This program may not be uptodate.
+//     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. use $ACE_ROOT/tests for this.
+//     This is for testing 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 C-language version of the 
+//     $ACE_ROOT/examples/Reactor/Proactor/test_aiosig_ace.cpp, with 
+//     all the ACE calls removed.
+//     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
-//     CC -g -o test_aiosig -lrt test_aiosig.cpp   
+//     CC -g -o test_aiosig -lposix4 test_aiosig.cpp   
 //
 // = RUN
 //     ./test_aiosig
@@ -45,8 +60,6 @@ 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)
@@ -65,13 +78,31 @@ setup_signal_delivery (void)
     }
   
   // Mask them.
-  if (pthread_sigmask (SIG_BLOCK, &completion_signal, 0) == -1)
+  if (sigprocmask (SIG_BLOCK, &completion_signal, 0) == -1)
     {
       perror ("Error:Couldnt maks the RT completion signals\n");
       return -1;
     }
   
-  return setup_signal_handler (SIGRTMIN);
+  // 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
@@ -251,37 +282,6 @@ test_aio_calls (void)
 }
 
 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)
diff --git a/examples/Reactor/Proactor/test_aiosig_ace.cpp b/examples/Reactor/Proactor/test_aiosig_ace.cpp
index bfb36d78b46..09094727629 100644
--- a/examples/Reactor/Proactor/test_aiosig_ace.cpp
+++ b/examples/Reactor/Proactor/test_aiosig_ace.cpp
@@ -8,17 +8,14 @@
 //     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 
+//     support POSIX <aio_> calls. use $ACE_ROOT/tests for this.
+//     This is for testing 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.
@@ -52,51 +49,28 @@ 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)
+  // 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) == -1)
+                 SIGRTMIN) < 0)
     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);
-}
+  // 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);
 
-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.
@@ -105,7 +79,7 @@ setup_signal_handler (int signal_number)
   // 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.
+  reaction.sa_sigaction = 0;         // No handler.
   int sigaction_return = sigaction (SIGRTMIN,
                                     &reaction,
                                     0);
@@ -116,7 +90,6 @@ setup_signal_handler (int signal_number)
   return 0;
 }
 
-
 static int
 issue_aio_calls (void)
 {
@@ -169,10 +142,10 @@ query_aio_completions (void)
       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,
@@ -185,7 +158,7 @@ query_aio_completions (void)
       if (sig_return == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Error:%p:Error waiting for RT completion signals\n"),
-                          -1);
+                          0);
 
       // RT completion signals returned.
       if (sig_return != SIGRTMIN)
@@ -275,30 +248,18 @@ test_aio_calls (void)
                        "ACE_OS::open"),
                       -1);
 
-  if (setup_signal_delivery () == -1)
+  if (setup_signal_delivery () < 0)
     return -1;
 
-  if (issue_aio_calls () == -1)
+  if (issue_aio_calls () < 0)
     return -1;
 
-  if (query_aio_completions () == -1)
+  if (query_aio_completions () < 0)
     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 *[])
 {
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..7d25fd9f3c4 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -33,10 +33,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 +89,8 @@ private:
 };
 
 Receiver::Receiver (void)
-  : dump_file_ (ACE_INVALID_HANDLE),
-    handle_ (ACE_INVALID_HANDLE)
+  : handle_ (ACE_INVALID_HANDLE),
+    dump_file_ (ACE_INVALID_HANDLE)
 {
 }
 
@@ -158,7 +154,6 @@ Receiver::open (ACE_HANDLE handle,
                                                                      initial_read_size,
                                                                      0,
                                                                      ACE_INVALID_HANDLE,
-                                                                     0,
                                                                      0);
       
       size_t bytes_transferred = message_block.length ();
@@ -303,9 +298,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,7 +392,8 @@ 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.
@@ -409,11 +402,14 @@ Sender::transmit_file (void)
 						this->welcome_message_.length (),
 						this->welcome_message_.duplicate (),
 						this->welcome_message_.length ());
-  
+
+  // Starting position
+  cerr << "Starting 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 +432,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 +581,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  
   if (parse_args (argc, argv) == -1)
     return -1;
 
@@ -616,5 +616,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..04d9b20d471 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,26 +75,25 @@ 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;
 }
 
@@ -118,16 +102,3 @@ 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/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile
index 8937050e2b7..8fb502a556c 100644
--- a/examples/Service_Configurator/IPC-tests/client/Makefile
+++ b/examples/Service_Configurator/IPC-tests/client/Makefile
@@ -237,11 +237,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/remote_dgram_client_test.o .obj/remote_dgram_client_test.so .shobj/remote_dgram_client_test.o .shobj/remote_dgram_client_test.so: remote_dgram_client_test.cpp \
diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile
index ad9b434c583..d1bf729af2a 100644
--- a/examples/Service_Configurator/IPC-tests/server/Makefile
+++ b/examples/Service_Configurator/IPC-tests/server/Makefile
@@ -973,10 +973,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- Handle_L_SPIPE.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
 .obj/Handle_Thr_Stream.o .obj/Handle_Thr_Stream.so .shobj/Handle_Thr_Stream.o .shobj/Handle_Thr_Stream.so: Handle_Thr_Stream.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -1004,11 +1001,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/TLI.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Acceptor.i \
  Handle_Thr_Stream.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -1122,7 +1116,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- Handle_Thr_Stream.i Handle_Thr_Stream.cpp
+ Handle_Thr_Stream.i Handle_Thr_Stream.cpp \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i
 .obj/server_test.o .obj/server_test.so .shobj/server_test.o .shobj/server_test.so: server_test.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
deleted file mode 100644
index b7fe34725e7..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "Semaphore_Test.h"
-// $Id$
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-
-int
-main (void)
-{
-  ACE_SV_Shared_Memory shm_client (SHM_KEY, 
-				   SHMSZ, 
-				   ACE_SV_Shared_Memory::ACE_OPEN);
-  ACE_SV_Semaphore_Simple sem (SEM_KEY_1, 
-			       ACE_SV_Semaphore_Simple::ACE_OPEN, 0, 2);
-
-  char *s = (char *) shm_client.get_segment_ptr ();
-
-  if (sem.acquire (0) < 0)
-    ACE_OS::perror ("client sem.acquire"), ACE_OS::exit (1);
-
-  while (*s != '\0')
-    putchar (*s++);
-
-  putchar ('\n');
-
-  if (sem.release (1) < 0)
-    ACE_OS::perror ("client sem.release"), ACE_OS::exit (1);
-
-  return 0;
-}
-
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
deleted file mode 100644
index f9931705c26..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-#include "ace/Signal.h"
-#include "Semaphore_Test.h"
-
-static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
-static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
-
-extern "C" void 
-cleanup (int)
-{
-  if (shm_server.remove () < 0 || sem.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1));
-  ACE_OS::exit (0);
-}
-
-int
-main (void)
-{
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT);
-
-  char *s = (char *) shm_server.get_segment_ptr ();
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (sem.release (0) < 0)
-    ESD ("server sem.release", done);
-
-  if (sem.acquire (1) < 0)
-    ESD ("server sem.acquire", done);
-
-done:
-  cleanup ();
-  return 0;
-}
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h b/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
deleted file mode 100644
index 72aab815ff8..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Log_Msg.h"
-
-#define SHMSZ 27
-#define SEM_KEY_1 2345
-#define SEM_KEY_2 4321
-#define SHM_KEY 5678
-
-#define ESD(MSG,LABEL) do { ACE_ERROR ((LM_ERROR, MSG)); goto LABEL; } while (0)
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
deleted file mode 100644
index b98c664883b..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Illustrates the use of the Semaphore_Complex class.  Note that it
-// $Id$
-
-// doesn't matter whether the parent or the child creates the
-// semaphore since Semaphore_Complex will correctly serialize the
-// intialization of the mutex and synch objects.
-#include "ace/Malloc.h"
-#include "ace/SV_Semaphore_Complex.h"
-#include "Semaphore_Test.h"
-
-ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple> allocator;
-ACE_SV_Semaphore_Complex *mutex = 0; 
-ACE_SV_Semaphore_Complex *synch = 0; 
-
-/* Pointer to memory shared by both the client and server. */
-static char *shm;
-
-static int
-do_parent (void)
-{
-  char *s = shm;
-
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (mutex->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server mutex.release"), 1);
-
-  if (synch->acquire () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server synch.acquire"), 1);
-  return 0;
-}
-
-static int
-do_child (void)
-{
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  while (mutex->tryacquire () == -1)
-    if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, "spinning in client!\n"));
-    else
-      ACE_ERROR_RETURN ((LM_ERROR, "client mutex.tryacquire"), 1);
-
-  for (char *s = (char *) shm; *s != '\0'; s++)
-    putchar (*s);
-
-  putchar ('\n');
-
-  if (synch->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "client synch.release"), 1);
-  return 0;
-}
-
-int
-main (void)
-{
-  shm = (char *) allocator.malloc (27);
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "fork failed\n"), -1);
-      /* NOTREACHED */
-    case 0:
-      return do_child ();
-    default:
-      {
-	int result = do_parent ();
-
-	if (wait (0) == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "wait"), -1);
-
-	allocator.remove ();
-
-	if (mutex->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mutex.remove"), -1);
-	else if (synch->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "synch.remove"), -1);
-	return result;
-      }
-    }
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
diff --git a/examples/Threads/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/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_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..9526765dcd2 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -19,6 +19,7 @@ endif # CXX_VERSION
 
 CXX_1016 =
 CXX_1136 =
+CXX_1180 =
 
 ifneq (,$(optimize))
   CXX_1016 = ,1016
@@ -32,6 +33,8 @@ ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION)))
   endif # 6.1-029
 else  # 6.2 or later
   CXX_1136 = ,1136
+  #### 6.2-009 has 1180, but 6.2-007 doesn't.
+  CXX_1180 = ,1180
 endif # 6.2 or later
 endif # ! 6.0
 
@@ -40,23 +43,21 @@ endif # ! 6.0
 #### 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
+# 1180: statement causes unreachable return
 ifneq ($(CXX_VER),CXX_5)
-  WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag
+  WARNING_FLAGS += -w0 -msg_display_number
   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
+    -msg_disable 9,174,193,236,401,610,835,839$(CXX_1016)$(CXX_1136)$(CXX_1180)
 endif # 6.0 or later
 
 CCFLAGS         += $(CFLAGS) -ptr ptrepository $(WARNING_FLAGS)
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
index 5bfe2b61993..e4d53c4510e 100644
--- a/include/makeinclude/platform_psos_diab_ppc.GNU
+++ b/include/makeinclude/platform_psos_diab_ppc.GNU
@@ -8,11 +8,8 @@
 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
+            -L $(PSS_SYS_DIR) -lsysxx -lsys
 
 PSS_BSP_LIB	= -L $(PSS_BSP) -lbsp
 
@@ -37,7 +34,10 @@ 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_TIME_T_DEFINED -D_WCHAR_T_DEFINED -D__wchar_t  //original line
+#sandass's stuff is below
 DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t  
+# DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t
 
 # ================================================================
 # Compilation Settings and Flags
@@ -57,7 +57,7 @@ static_libs = 1
 
 
 # C Compiler
-CC              = dcc -tPPC860ES:psos
+CC              = dcc -tMC68060FS:psos
 # -WDCDCONFIG=psos.conf
 
 # C Debug Compiler Flags
@@ -88,12 +88,8 @@ CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINC
 # -# 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.
+# -g embeds debug info but turns off a bunch of optimizations, including inlining
+# -g1 embeds debug info but not line numbers, and preserves inlining
 # -v runs the compiler in verbose mode
 # -w suppresses warnings
 # -H prints path names of all include files to stderr
@@ -108,12 +104,8 @@ CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINC
 #    -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
+# sandass was here
 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
 
@@ -148,11 +140,11 @@ DCCFLAGS         +=  $(DCFLAGS)
 
 # Dynamic Linker
 # DLD             = dld
-DLD             = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
+DLD             = dplus -tMC68060FS:psos -Wm$(PSS_BSP)/ram.lnk
 
 # Static Linker
 # LD              = dld
-LD              = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
+LD              = dplus -tMC68060FS:psos -Wm$(PSS_BSP)/ram.lnk
 
 # Static Linker Flags
 # -L<path> adds a directory path to the linker search path
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
index b0143f3162a..862aec77e51 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,7 +18,7 @@ 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
@@ -25,12 +27,6 @@ ARFLAGS  = -archive -o
 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..ea8cad74def 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -28,17 +28,6 @@ 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
   LDFLAGS += -mt
@@ -97,12 +86,12 @@ 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
+  LIBS          += -lITinimt -liiopmt -lorbixmt
 else
   LIBS          += -lITini -liiop -lorbix
 endif
 
-  LIBS          += -lsocket -ldl -lnsl -lgen -lposix4
+  LIBS          += -lsocket -ldl -lnsl -lthread -lgen -lposix4
   CPPFLAGS      += -I$(ORBIX_ROOT)/corba2/include
 else
 ifeq ($(distrib),0)
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..e111e4a1215 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -17,7 +17,6 @@ CROSS-COMPILE = 1
 
 debug = 1
 optimize = 1
-rtti =
 shared_libs =
 static_libs = 1
 
@@ -77,13 +76,6 @@ ifeq ($(CPU),PPC604)
   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
@@ -101,7 +93,6 @@ else
   CCFLAGS += -fno-implicit-templates
 endif # I80386
 endif # I80486
-endif # PPC860
 endif # PPC604
 
 
@@ -116,38 +107,12 @@ 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
 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 +122,9 @@ LDFLAGS         += -X -r
 #### the i386 family.  And -O2 causes some compilation failures.
 OCFLAGS         += -O
 PIC             =
+AR              = ar$(TOOLENV)
+ARFLAGS         = rv
+RANLIB          = @true
 
 
 #### ld can't handle INCLDIRS, so override LINK definitions.
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..9b7c8acf337 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)/%) \
@@ -93,9 +92,7 @@ ifdef TEMPINCDIR
 	fi
 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 +114,5 @@ ifdef SHLIBA
 $(SHLIBA): $(VSHLIB)
 	$(AR) $(ARFLAGS) $@ $?
 	-chmod a+rx $@
-ifneq (,$(RANLIB))
 	-$(RANLIB) $@
-endif # RANLIB
 endif
diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU
index 16636a25a25..e1f70abdc43 100644
--- a/include/makeinclude/rules.nested.GNU
+++ b/include/makeinclude/rules.nested.GNU
@@ -1,14 +1,13 @@
 #----------------------------------------------------------------------------
-#       $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
+	@for dir in $(DIRS) ;\
+	do \
+		 $(MAKE) -C $$dir $(@:.nested=); \
+	done
 endif # DIRS
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index a36f854f89a..be6035f5f93 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -39,8 +39,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
@@ -246,57 +244,11 @@ 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++)
@@ -375,9 +327,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/m4/threads.m4 b/m4/threads.m4
index 9074e84f748..7b9a7a6d3c0 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -50,11 +50,7 @@ dnl Check if compiler accepts specific flag to enable threads
     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.
+    ACE_SEARCH_THREAD_FLAGS(mt pthread pthreads mthreads threads Kthread,,)
    ],
    [
     dnl Do nothing
@@ -75,68 +71,66 @@ dnl Check if compiler accepts specific flag to enable threads
  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,
+ ACE_SEARCH_LIBS(pthread_create, pthread pthreads c_r gthreads,
+   [
+    ace_has_pthreads=yes
+    AC_DEFINE(ACE_HAS_PTHREADS)
+   ],
    [
-    AC_EGREP_CPP(ACE_PTHREAD_MACROS,
+    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
+         ])
       ],
       [
-       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
+       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
-          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_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
@@ -172,26 +166,26 @@ thr_create();
   AC_TRY_CPP(
     [
 #include <pthread.h>
-    ],
-    [
-     cat > conftest.$ac_ext <<EOF
+    ], ace_header_exists=yes, ace_header_exists=no)
+
+  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"
-    ])
+  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(
 [
diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile
index 0b01959e8b6..7e0381019cc 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.
 
diff --git a/netsvcs/clients/Makefile b/netsvcs/clients/Makefile
index 00ad80fb15b..cd00dc819e3 100644
--- a/netsvcs/clients/Makefile
+++ b/netsvcs/clients/Makefile
@@ -4,15 +4,23 @@
 #       Makefile for the client programs that test the ACE network services
 #----------------------------------------------------------------------------
 
-DIRS  = Logger \
-        Naming \
-        Tokens
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+#### If the ACE library wasn't built with the Other component, don't
+#### try to build the clients.
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
+ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
+  DIRS  = Logger \
+          Naming \
+          Tokens
+else
+  DIRS =
+endif # ! Other
+
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
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..a489da9eb22 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.
 
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 7dedde59b5f..6321fbe161f 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -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..c32cc776de6 100644
--- a/netsvcs/clients/Naming/Client/svc.conf
+++ b/netsvcs/clients/Naming/Client/svc.conf
@@ -1,7 +1,7 @@
 # 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 ()
+dynamic ACE_Naming_Context Service_Object * libACE.so:_make_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..c5e7f4e145a 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.
 
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/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/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile
index 214c6347ae2..f711d160ef4 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
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile
index 680e9aa918b..654e84a44d7 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
diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile
index 48085803036..fa31a5140e3 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
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/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile
index 28473118278..a229ed7d071 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
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile
index 3859d16f9ed..50b8b740dd9 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
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..86b8854398b 100644
--- a/netsvcs/lib/Makefile
+++ b/netsvcs/lib/Makefile
@@ -700,13 +700,10 @@ endif # SUPPRESS_DASH_G
  $(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/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -885,13 +882,10 @@ endif # SUPPRESS_DASH_G
  $(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/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
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/servers/Makefile b/netsvcs/servers/Makefile
index ad3c0c9e143..ebe864d27b4 100644
--- a/netsvcs/servers/Makefile
+++ b/netsvcs/servers/Makefile
@@ -10,24 +10,23 @@
 
 LDLIBS  = -lnetsvcs
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-LSRC = $(addsuffix .cpp,$(BIN))
 
-BIN2 = main
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
+#### If the ACE library wasn't built with Token and Other components, don't
+#### try to build the server.
 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)
+    BIN = main
+    LSRC = $(addsuffix .cpp,$(BIN))
   endif # ! Token
 endif # ! Other
 
-#----------------------------------------------------------------------------
-#       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
@@ -226,10 +225,7 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/netsvcs/lib/Server_Logging_Handler_T.h \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
- $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/TLI_Stream.h \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/netsvcs/lib/Server_Logging_Handler_T.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
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..86589a4c4b2 100644
--- a/performance-tests/Misc/Makefile
+++ b/performance-tests/Misc/Makefile
@@ -27,20 +27,19 @@ 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
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+#### If the ACE library wasn't built with the Other component, don't
+#### try to build test_naming.
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
+ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
+  BIN += test_naming
+endif # ! Other
+
 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/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/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index b8c5c581270..09291518276 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -191,8 +191,6 @@ 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>;
@@ -211,8 +209,6 @@ 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>
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/run_tests.pl b/performance-tests/Synch-Benchmarks/run_tests.pl
index 1ef43e69298..21d28cc281a 100755
--- a/performance-tests/Synch-Benchmarks/run_tests.pl
+++ b/performance-tests/Synch-Benchmarks/run_tests.pl
@@ -17,9 +17,6 @@ $result_dir = "results";
 $svcconf_dir = "svcconf";
 $conf_ext = ".conf";
 
-@Null_List = ();
-
-# This is called "baseline"
 @Baseline_List = ("base_acquire",
                   "base_tryacquire",
                   "base_acquire_read",
@@ -27,54 +24,23 @@ $conf_ext = ".conf";
                   "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
+    if ($ARGV[0] eq '-d') # Run debug
     {
         $debug = 1;
-        print "debug perl scirpt\n";
+        $name = "debug";
     }
-    elsif ($ARGV[0] eq '-D')    # Subdir name to put the result
+    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.
+    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";
@@ -83,8 +49,7 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ )
     shift;
 }
 
-die "You must specify a test to run\n" if (scalar (@Target) == 0);
-
+@Target = @Baseline_List;
 if ($Win32 != 0)
 {
     $execname = "$name\\$EXE";
@@ -100,32 +65,12 @@ else
 
 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";
-    }
+    open STDOUT, "> $result_dir$DIR_SEPARATOR$Target[$Cntr].$name";
+    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);
-    }
+    system (@args);
 }
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
index ec2d85fbcbf..67b355c1087 100644
--- a/performance-tests/Synch-Benchmarks/svcconf/svc.conf
+++ b/performance-tests/Synch-Benchmarks/svcconf/svc.conf
@@ -1,29 +1,24 @@
 # 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 Performance_Test Service_Object * Perf_Test/Perf_Test:_make_Performance_Test() "-s 3"
 #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 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 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_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()
+# 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()
+
+# ACE_Condition_Thread_Mutex
+# ACE_File_Lock
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/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index de8bf8d898c..6376ba36d28 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -43,8 +43,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)
@@ -147,17 +145,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")));
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/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/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/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/Makefile b/tests/Makefile
index 8f3f0dd0713..003d0597e77 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,7 +36,6 @@ BIN =   Aio_Platform_Test \
         Message_Block_Test \
         Message_Queue_Test \
         Message_Queue_Notifications_Test \
-        New_Fail_Test \
         Notify_Performance_Test \
         Process_Mutex_Test \
         Process_Strategy_Test \
@@ -53,7 +52,6 @@ BIN =   Aio_Platform_Test \
         Reactor_Timer_Test \
         Reader_Writer_Test \
         Recursive_Mutex_Test \
-        Reverse_Lock_Test \
         Semaphore_Test \
         Service_Config_Test \
         Sigset_Ops_Test \
@@ -75,34 +73,26 @@ BIN =   Aio_Platform_Test \
         UPIPE_SAP_Test \
         Upgradable_RW_Test
 
-BIN2 = Naming_Test \
-       Thread_Pool_Reactor_Test \
-       XtReactor_Test \
-       FlReactor_Test \
-	TkReactor_Test	
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 #### 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)
+  BIN += Naming_Test \
+         Thread_Pool_Reactor_Test \
+         XtReactor_Test
 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))
 
-#----------------------------------------------------------------------------
-#       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
@@ -143,19 +133,20 @@ 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-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 \
@@ -182,19 +173,20 @@ realclean: clean
 .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-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 \
@@ -220,19 +212,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp
 .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-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 +251,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 \
@@ -281,20 +273,21 @@ realclean: clean
 .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 \
  $(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/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 \
+ test_config.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -319,19 +312,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp
 .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-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 +353,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 +389,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 \
@@ -446,19 +437,20 @@ realclean: clean
  $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -490,7 +482,6 @@ realclean: clean
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_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 \
@@ -513,24 +504,23 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -555,7 +545,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 \
@@ -576,19 +565,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Memory_Pool.i
 .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-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 +629,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 +646,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 \
@@ -734,22 +721,24 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i Conn_Test.h
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ Conn_Test.h
 .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-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 +763,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 +780,23 @@ 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-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 +820,27 @@ 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 \
+ DLL_Test.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-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 \
@@ -881,19 +870,20 @@ realclean: clean
  $(ACE_ROOT)/ace/INET_Addr.i
 .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-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,28 +908,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 \
  $(ACE_ROOT)/ace/Env_Value_T.h \
  $(ACE_ROOT)/ace/Env_Value_T.i \
  $(ACE_ROOT)/ace/Env_Value_T.cpp
 .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-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 +958,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 +992,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 \
@@ -1058,19 +1043,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 .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-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 +1088,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 \
@@ -1123,19 +1108,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Memory_Pool.i
 .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-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 +1148,24 @@ 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-g++-common.h \
- test_config.h $(ACE_ROOT)/ace/OS.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 +1190,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 \
@@ -1225,19 +1210,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Memory_Pool.i
 .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-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 \
@@ -1278,7 +1264,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 +1281,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 \
@@ -1311,19 +1294,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 .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-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 +1339,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 +1356,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 \
@@ -1463,19 +1444,20 @@ realclean: clean
  $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -1507,7 +1489,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 \
@@ -1531,8 +1512,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 \
@@ -1573,19 +1552,20 @@ realclean: clean
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -1613,7 +1593,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 +1616,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 \
@@ -1672,19 +1649,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Profile_Timer.i
 .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-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 \
@@ -1712,19 +1690,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i
 .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-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 +1734,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 \
@@ -1775,19 +1753,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.i
 .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-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 +1803,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,8 +1841,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/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -1901,19 +1877,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Pipe.i
 .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-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 +1916,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 \
@@ -1980,19 +1956,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Handle_Set.i
 .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-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 +2000,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 +2034,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 \
@@ -2108,19 +2082,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Profile_Timer.i
 .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-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 +2121,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 +2157,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 \
@@ -2223,19 +2195,20 @@ realclean: clean
 .obj/Message_Queue_Notifications_Test.o .obj/Message_Queue_Notifications_Test.so .shobj/Message_Queue_Notifications_Test.o .shobj/Message_Queue_Notifications_Test.so: \
  Message_Queue_Notifications_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 +2244,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 +2267,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 \
@@ -2344,60 +2314,22 @@ 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 \
- $(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/CORBA_macros.h
 .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-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 +2362,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,8 +2408,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 \
@@ -2521,19 +2450,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 .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-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 +2488,25 @@ 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-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 +2538,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 +2555,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 \
@@ -2717,19 +2642,20 @@ realclean: clean
  Process_Strategy_Test.h
 .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-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 +2682,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 +2715,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 \
@@ -2829,19 +2752,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue.i
 .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-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 +2792,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 +2825,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 \
@@ -2945,19 +2866,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Sched_Params.i
 .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-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 +2910,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 +2944,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 \
@@ -3070,19 +2989,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Sched_Params.i
 .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-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 +3053,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 +3070,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 \
@@ -3246,19 +3163,20 @@ realclean: clean
  Priority_Reactor_Test.h
 .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-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 +3203,25 @@ 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-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 +3252,23 @@ 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-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 +3299,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 +3333,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 \
@@ -3486,17 +3380,18 @@ 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-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 +3417,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 \
@@ -3562,19 +3456,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.cpp
 .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-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 +3500,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 +3534,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 \
@@ -3699,19 +3591,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Select_Reactor.i
 .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-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 +3651,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 +3685,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 \
@@ -3877,19 +3767,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 .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-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 +3813,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 \
@@ -3944,19 +3834,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor_Impl.h
 .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-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 +3873,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 \
@@ -4006,19 +3896,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Get_Opt.i
 .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-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 +3937,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 +3956,22 @@ 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-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 +3997,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 \
@@ -4168,19 +4020,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Get_Opt.i
 .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-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 +4064,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 +4081,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 \
@@ -4244,19 +4094,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 .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-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 \
@@ -4283,19 +4134,20 @@ realclean: clean
 .obj/Simple_Message_Block_Test.o .obj/Simple_Message_Block_Test.so .shobj/Simple_Message_Block_Test.o .shobj/Simple_Message_Block_Test.so: Simple_Message_Block_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 +4173,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 \
@@ -4346,19 +4197,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp
 .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-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 +4236,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 \
@@ -4425,19 +4276,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Handle_Set.i
 .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-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 \
@@ -4478,19 +4330,20 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Connector.i
 .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-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 +4369,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 +4392,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 \
@@ -4553,19 +4403,20 @@ realclean: clean
  $(ACE_ROOT)/ace/SPIPE_Acceptor.h
 .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-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 +4439,23 @@ 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-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 +4480,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 \
@@ -4652,19 +4500,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Memory_Pool.i
 .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-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 +4544,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 +4578,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 \
@@ -4775,19 +4621,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp
 .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-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 +4660,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 +4678,24 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i
+ $(ACE_ROOT)/ace/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-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 +4721,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 \
@@ -4895,19 +4742,20 @@ realclean: clean
  $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 +4786,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 +4820,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 \
@@ -5019,19 +4864,20 @@ realclean: clean
 .obj/Timeprobe_Test.o .obj/Timeprobe_Test.so .shobj/Timeprobe_Test.o .shobj/Timeprobe_Test.so: Timeprobe_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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -5058,19 +4904,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Timeprobe.h
 .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-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 +4942,24 @@ 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-g++-common.h \
- test_config.h $(ACE_ROOT)/ace/OS.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 \
@@ -5139,19 +4985,20 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp
 .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-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 +5036,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 \
@@ -5218,19 +5064,20 @@ realclean: clean
  $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 +5103,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 \
@@ -5279,19 +5125,20 @@ realclean: clean
  TSS_Test_Errno.h
 .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-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 +5166,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 +5202,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 \
@@ -5425,19 +5269,20 @@ realclean: clean
 .obj/Upgradable_RW_Test.o .obj/Upgradable_RW_Test.so .shobj/Upgradable_RW_Test.o .shobj/Upgradable_RW_Test.so: Upgradable_RW_Test.cpp Upgradable_RW_Test.h \
  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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 +5313,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 +5347,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 \
@@ -5555,19 +5397,20 @@ realclean: clean
  $(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 \
  $(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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -5591,9 +5434,6 @@ realclean: clean
  $(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 \
@@ -5657,19 +5497,20 @@ realclean: clean
 .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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_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 \
@@ -5720,7 +5561,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 \
@@ -5738,8 +5578,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 \
@@ -5824,95 +5662,20 @@ realclean: clean
  $(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/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 \
@@ -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.am b/tests/Makefile.am
index fcc11f677b0..08b3bac5166 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,9 @@ AUTOMAKE_OPTIONS = 1.4
 ##                         -Ossama
 ## SUBDIRS = CLASSIX \
 ##           WinCE \
+##           log \
 ##           version_tests
+SUBDIRS = log
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
@@ -45,79 +47,73 @@ 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 \
+## Build the test programs
+noinst_PROGRAMS = \
+	Aio_Platform_Test \
+	Atomic_Op_Test \
+	Barrier_Test \
+	Basic_Types_Test \
+	Buffer_Stream_Test \
         CDR_Test \
-        Collection_Test \
-        Conn_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 \
+	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 \
+	IOStream_Test \
+	MM_Shared_Memory_Test \
+	MT_Reactor_Timer_Test \
+	MT_SOCK_Test \
+	Map_Manager_Test \
+	Mem_Map_Test \
+	Message_Block_Test \
+	Message_Queue_Notifications_Test \
+	Message_Queue_Test \
+	Naming_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 \
+	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 \
+	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
@@ -132,10 +128,6 @@ 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
@@ -167,8 +159,6 @@ 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
@@ -179,8 +169,6 @@ 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
@@ -199,8 +187,6 @@ 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
@@ -218,8 +204,6 @@ 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
@@ -283,7 +267,7 @@ noinst_DATA = UNIXserver.conf \
               Win32tokens.conf
 
 
-## The tests we want to run are all of the test programs we are going to build.
+## The tests we want to run are all of the test program we are going to build.
 ## Do not run them if they are cross-compiled.
 if ACE_CROSS_COMPILED
 TESTS =
@@ -301,18 +285,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA)
 ##                 $(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/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..a88f143f3d1 100644
--- a/tests/README
+++ b/tests/README
@@ -19,6 +19,7 @@ $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)
+    (... 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.
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 5b66c4ba70c..259dbdec69a 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;
@@ -185,24 +189,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++)
@@ -345,10 +352,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 +383,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/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/run_tests.bat b/tests/run_tests.bat
index 05e9d4c3adf..caf8f51491a 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -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
@@ -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
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..a9879e07d93 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -159,10 +159,10 @@ 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
+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 +175,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 $TOKEN && (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 $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 +200,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>